diff --git a/asm/non_matchings/code/audio_heap/func_800DE3DC.s b/asm/non_matchings/code/audio_heap/Audio_Alloc.s similarity index 98% rename from asm/non_matchings/code/audio_heap/func_800DE3DC.s rename to asm/non_matchings/code/audio_heap/Audio_Alloc.s index 98db323860..12bf776e96 100644 --- a/asm/non_matchings/code/audio_heap/func_800DE3DC.s +++ b/asm/non_matchings/code/audio_heap/Audio_Alloc.s @@ -1,4 +1,4 @@ -glabel func_800DE3DC +glabel Audio_Alloc /* B5557C 800DE3DC 8C860004 */ lw $a2, 4($a0) /* B55580 800DE3E0 8C8E0000 */ lw $t6, ($a0) /* B55584 800DE3E4 8C8F0008 */ lw $t7, 8($a0) diff --git a/asm/non_matchings/code/audio_heap/func_800DE8E0.s b/asm/non_matchings/code/audio_heap/Audio_AllocBankOrSeq.s similarity index 89% rename from asm/non_matchings/code/audio_heap/func_800DE8E0.s rename to asm/non_matchings/code/audio_heap/Audio_AllocBankOrSeq.s index 7507cefc38..9d26ecbc9d 100644 --- a/asm/non_matchings/code/audio_heap/func_800DE8E0.s +++ b/asm/non_matchings/code/audio_heap/Audio_AllocBankOrSeq.s @@ -1,4 +1,4 @@ -glabel func_800DE8E0 +glabel Audio_AllocBankOrSeq /* B55A80 800DE8E0 27BDFFB0 */ addiu $sp, $sp, -0x50 /* B55A84 800DE8E4 AFB00018 */ sw $s0, 0x18($sp) /* B55A88 800DE8E8 00808025 */ move $s0, $a0 @@ -19,22 +19,22 @@ glabel func_800DE8E0 /* B55AC0 800DE920 1000000F */ b .L800DE960 /* B55AC4 800DE924 00000000 */ nop .L800DE928: -/* B55AC8 800DE928 3C088017 */ lui $t0, %hi(D_80171BA0) # $t0, 0x8017 -/* B55ACC 800DE92C 3C0B8017 */ lui $t3, %hi(D_80172618) # $t3, 0x8017 -/* B55AD0 800DE930 25081BA0 */ addiu $t0, %lo(D_80171BA0) # addiu $t0, $t0, 0x1ba0 +/* B55AC8 800DE928 3C088017 */ lui $t0, %hi(gAudioContext+0x2a20) # $t0, 0x8017 +/* B55ACC 800DE92C 3C0B8017 */ lui $t3, %hi(gAudioContext+0x3498) # $t3, 0x8017 +/* B55AD0 800DE930 25081BA0 */ addiu $t0, %lo(gAudioContext+0x2a20) # addiu $t0, $t0, 0x1ba0 /* B55AD4 800DE934 1000000A */ b .L800DE960 -/* B55AD8 800DE938 256B2618 */ addiu $t3, %lo(D_80172618) # addiu $t3, $t3, 0x2618 +/* B55AD8 800DE938 256B2618 */ addiu $t3, %lo(gAudioContext+0x3498) # addiu $t3, $t3, 0x2618 .L800DE93C: -/* B55ADC 800DE93C 3C088017 */ lui $t0, %hi(D_80171CB0) # $t0, 0x8017 -/* B55AE0 800DE940 3C0B8017 */ lui $t3, %hi(D_801725E8) # $t3, 0x8017 -/* B55AE4 800DE944 25081CB0 */ addiu $t0, %lo(D_80171CB0) # addiu $t0, $t0, 0x1cb0 +/* B55ADC 800DE93C 3C088017 */ lui $t0, %hi(gAudioContext+0x2b30) # $t0, 0x8017 +/* B55AE0 800DE940 3C0B8017 */ lui $t3, %hi(gAudioContext+0x3468) # $t3, 0x8017 +/* B55AE4 800DE944 25081CB0 */ addiu $t0, %lo(gAudioContext+0x2b30) # addiu $t0, $t0, 0x1cb0 /* B55AE8 800DE948 10000005 */ b .L800DE960 -/* B55AEC 800DE94C 256B25E8 */ addiu $t3, %lo(D_801725E8) # addiu $t3, $t3, 0x25e8 +/* B55AEC 800DE94C 256B25E8 */ addiu $t3, %lo(gAudioContext+0x3468) # addiu $t3, $t3, 0x25e8 .L800DE950: -/* B55AF0 800DE950 3C088017 */ lui $t0, %hi(D_80171DC0) # $t0, 0x8017 -/* B55AF4 800DE954 3C0B8017 */ lui $t3, %hi(D_801725B8) # $t3, 0x8017 -/* B55AF8 800DE958 25081DC0 */ addiu $t0, %lo(D_80171DC0) # addiu $t0, $t0, 0x1dc0 -/* B55AFC 800DE95C 256B25B8 */ addiu $t3, %lo(D_801725B8) # addiu $t3, $t3, 0x25b8 +/* B55AF0 800DE950 3C088017 */ lui $t0, %hi(gAudioContext+0x2c40) # $t0, 0x8017 +/* B55AF4 800DE954 3C0B8017 */ lui $t3, %hi(gAudioContext+0x3438) # $t3, 0x8017 +/* B55AF8 800DE958 25081DC0 */ addiu $t0, %lo(gAudioContext+0x2c40) # addiu $t0, $t0, 0x1dc0 +/* B55AFC 800DE95C 256B25B8 */ addiu $t3, %lo(gAudioContext+0x3438) # addiu $t3, $t3, 0x25b8 .L800DE960: /* B55B00 800DE960 14C00192 */ bnez $a2, .L800DEFAC /* B55B04 800DE964 25040004 */ addiu $a0, $t0, 4 @@ -68,13 +68,13 @@ glabel func_800DE8E0 /* B55B60 800DE9C0 16090047 */ bne $s0, $t1, .L800DEAE0 /* B55B64 800DE9C4 24010004 */ li $at, 4 /* B55B68 800DE9C8 15810020 */ bne $t4, $at, .L800DEA4C -/* B55B6C 800DE9CC 3C058017 */ lui $a1, %hi(D_80171A14) # $a1, 0x8017 -/* B55B70 800DE9D0 8CA51A14 */ lw $a1, %lo(D_80171A14)($a1) +/* B55B6C 800DE9CC 3C058017 */ lui $a1, %hi(gAudioContext+0x2894) # $a1, 0x8017 +/* B55B70 800DE9D0 8CA51A14 */ lw $a1, %lo(gAudioContext+0x2894)($a1) /* B55B74 800DE9D4 00001825 */ move $v1, $zero -/* B55B78 800DE9D8 3C028017 */ lui $v0, %hi(D_801726AC) # $v0, 0x8017 +/* B55B78 800DE9D8 3C028017 */ lui $v0, %hi(gAudioContext+0x352c) # $v0, 0x8017 /* B55B7C 800DE9DC 18A0000D */ blez $a1, .L800DEA14 /* B55B80 800DE9E0 00C02025 */ move $a0, $a2 -/* B55B84 800DE9E4 8C4226AC */ lw $v0, %lo(D_801726AC)($v0) +/* B55B84 800DE9E4 8C4226AC */ lw $v0, %lo(gAudioContext+0x352c)($v0) .L800DE9E8: /* B55B88 800DE9E8 904E0033 */ lbu $t6, 0x33($v0) /* B55B8C 800DE9EC 55C60006 */ bnel $t6, $a2, .L800DEA08 @@ -94,7 +94,7 @@ glabel func_800DE8E0 /* B55BBC 800DEA1C AFA70024 */ sw $a3, 0x24($sp) /* B55BC0 800DEA20 AFA8004C */ sw $t0, 0x4c($sp) /* B55BC4 800DEA24 AFAB0030 */ sw $t3, 0x30($sp) -/* B55BC8 800DEA28 0C038686 */ jal func_800E1A18 +/* B55BC8 800DEA28 0C038686 */ jal Audio_SetBankLoadStatus /* B55BCC 800DEA2C A3AD003A */ sb $t5, 0x3a($sp) /* B55BD0 800DEA30 8FA70024 */ lw $a3, 0x24($sp) /* B55BD4 800DEA34 8FA8004C */ lw $t0, 0x4c($sp) @@ -106,13 +106,13 @@ glabel func_800DE8E0 .L800DEA4C: /* B55BEC 800DEA4C 24010004 */ li $at, 4 /* B55BF0 800DEA50 15A10023 */ bne $t5, $at, .L800DEAE0 -/* B55BF4 800DEA54 3C058017 */ lui $a1, %hi(D_80171A14) # $a1, 0x8017 -/* B55BF8 800DEA58 8CA51A14 */ lw $a1, %lo(D_80171A14)($a1) +/* B55BF4 800DEA54 3C058017 */ lui $a1, %hi(gAudioContext+0x2894) # $a1, 0x8017 +/* B55BF8 800DEA58 8CA51A14 */ lw $a1, %lo(gAudioContext+0x2894)($a1) /* B55BFC 800DEA5C 00001825 */ move $v1, $zero -/* B55C00 800DEA60 3C028017 */ lui $v0, %hi(D_801726AC) # $v0, 0x8017 +/* B55C00 800DEA60 3C028017 */ lui $v0, %hi(gAudioContext+0x352c) # $v0, 0x8017 /* B55C04 800DEA64 18A0000E */ blez $a1, .L800DEAA0 /* B55C08 800DEA68 00000000 */ nop -/* B55C0C 800DEA6C 8C4226AC */ lw $v0, %lo(D_801726AC)($v0) +/* B55C0C 800DEA6C 8C4226AC */ lw $v0, %lo(gAudioContext+0x352c)($v0) /* B55C10 800DEA70 84E4002A */ lh $a0, 0x2a($a3) .L800DEA74: /* B55C14 800DEA74 90590033 */ lbu $t9, 0x33($v0) @@ -135,7 +135,7 @@ glabel func_800DE8E0 /* B55C50 800DEAB0 AFAB0030 */ sw $t3, 0x30($sp) /* B55C54 800DEAB4 AFA8004C */ sw $t0, 0x4c($sp) /* B55C58 800DEAB8 AFA70024 */ sw $a3, 0x24($sp) -/* B55C5C 800DEABC 0C038686 */ jal func_800E1A18 +/* B55C5C 800DEABC 0C038686 */ jal Audio_SetBankLoadStatus /* B55C60 800DEAC0 24050003 */ li $a1, 3 /* B55C64 800DEAC4 8FA70024 */ lw $a3, 0x24($sp) /* B55C68 800DEAC8 8FA8004C */ lw $t0, 0x4c($sp) @@ -179,8 +179,8 @@ glabel func_800DE8E0 /* B55CE8 800DEB48 1600002F */ bnez $s0, .L800DEC08 /* B55CEC 800DEB4C 00000000 */ nop /* B55CF0 800DEB50 155F0016 */ bne $t2, $ra, .L800DEBAC -/* B55CF4 800DEB54 3C048017 */ lui $a0, %hi(D_801719DC) # $a0, 0x8017 -/* B55CF8 800DEB58 848419DC */ lh $a0, %lo(D_801719DC)($a0) +/* B55CF4 800DEB54 3C048017 */ lui $a0, %hi(gAudioContext+0x285c) # $a0, 0x8017 +/* B55CF8 800DEB58 848419DC */ lh $a0, %lo(gAudioContext+0x285c)($a0) /* B55CFC 800DEB5C 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 /* B55D00 800DEB60 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 /* B55D04 800DEB64 1880000D */ blez $a0, .L800DEB9C @@ -206,8 +206,8 @@ glabel func_800DE8E0 /* B55D48 800DEBA8 ACE00000 */ sw $zero, ($a3) .L800DEBAC: /* B55D4C 800DEBAC 154C0048 */ bne $t2, $t4, .L800DECD0 -/* B55D50 800DEBB0 3C048017 */ lui $a0, %hi(D_801719DC) # $a0, 0x8017 -/* B55D54 800DEBB4 848419DC */ lh $a0, %lo(D_801719DC)($a0) +/* B55D50 800DEBB0 3C048017 */ lui $a0, %hi(gAudioContext+0x285c) # $a0, 0x8017 +/* B55D54 800DEBB4 848419DC */ lh $a0, %lo(gAudioContext+0x285c)($a0) /* B55D58 800DEBB8 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 /* B55D5C 800DEBBC 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 /* B55D60 800DEBC0 1880000D */ blez $a0, .L800DEBF8 @@ -235,13 +235,13 @@ glabel func_800DE8E0 /* B55DA8 800DEC08 56090032 */ bnel $s0, $t1, .L800DECD4 /* B55DAC 800DEC0C 8CE20000 */ lw $v0, ($a3) /* B55DB0 800DEC10 155F0017 */ bne $t2, $ra, .L800DEC70 -/* B55DB4 800DEC14 3C058017 */ lui $a1, %hi(D_80171A14) # $a1, 0x8017 -/* B55DB8 800DEC18 8CA51A14 */ lw $a1, %lo(D_80171A14)($a1) +/* B55DB4 800DEC14 3C058017 */ lui $a1, %hi(gAudioContext+0x2894) # $a1, 0x8017 +/* B55DB8 800DEC18 8CA51A14 */ lw $a1, %lo(gAudioContext+0x2894)($a1) /* B55DBC 800DEC1C 00001825 */ move $v1, $zero -/* B55DC0 800DEC20 3C028017 */ lui $v0, %hi(D_801726AC) # $v0, 0x8017 +/* B55DC0 800DEC20 3C028017 */ lui $v0, %hi(gAudioContext+0x352c) # $v0, 0x8017 /* B55DC4 800DEC24 18A0000E */ blez $a1, .L800DEC60 /* B55DC8 800DEC28 00000000 */ nop -/* B55DCC 800DEC2C 8C4226AC */ lw $v0, %lo(D_801726AC)($v0) +/* B55DCC 800DEC2C 8C4226AC */ lw $v0, %lo(gAudioContext+0x352c)($v0) /* B55DD0 800DEC30 84E6001E */ lh $a2, 0x1e($a3) .L800DEC34: /* B55DD4 800DEC34 904F0033 */ lbu $t7, 0x33($v0) @@ -263,13 +263,13 @@ glabel func_800DE8E0 /* B55E0C 800DEC6C ACE00000 */ sw $zero, ($a3) .L800DEC70: /* B55E10 800DEC70 154C0017 */ bne $t2, $t4, .L800DECD0 -/* B55E14 800DEC74 3C058017 */ lui $a1, %hi(D_80171A14) # $a1, 0x8017 -/* B55E18 800DEC78 8CA51A14 */ lw $a1, %lo(D_80171A14)($a1) +/* B55E14 800DEC74 3C058017 */ lui $a1, %hi(gAudioContext+0x2894) # $a1, 0x8017 +/* B55E18 800DEC78 8CA51A14 */ lw $a1, %lo(gAudioContext+0x2894)($a1) /* B55E1C 800DEC7C 00001825 */ move $v1, $zero -/* B55E20 800DEC80 3C028017 */ lui $v0, %hi(D_801726AC) # $v0, 0x8017 +/* B55E20 800DEC80 3C028017 */ lui $v0, %hi(gAudioContext+0x352c) # $v0, 0x8017 /* B55E24 800DEC84 18A0000E */ blez $a1, .L800DECC0 /* B55E28 800DEC88 00000000 */ nop -/* B55E2C 800DEC8C 8C4226AC */ lw $v0, %lo(D_801726AC)($v0) +/* B55E2C 800DEC8C 8C4226AC */ lw $v0, %lo(gAudioContext+0x352c)($v0) /* B55E30 800DEC90 84E4002A */ lh $a0, 0x2a($a3) .L800DEC94: /* B55E34 800DEC94 904E0033 */ lbu $t6, 0x33($v0) @@ -497,7 +497,7 @@ glabel func_800DE8E0 .L800DEFAC: /* B5614C 800DEFAC AFA60058 */ sw $a2, 0x58($sp) /* B56150 800DEFB0 AFA8004C */ sw $t0, 0x4c($sp) -/* B56154 800DEFB4 0C0378F7 */ jal func_800DE3DC +/* B56154 800DEFB4 0C0378F7 */ jal Audio_Alloc /* B56158 800DEFB8 AFAB0030 */ sw $t3, 0x30($sp) /* B5615C 800DEFBC 8FA8004C */ lw $t0, 0x4c($sp) /* B56160 800DEFC0 2407000C */ li $a3, 12 diff --git a/asm/non_matchings/code/audio_heap/Audio_SoundAlloc.s b/asm/non_matchings/code/audio_heap/Audio_AllocDmaMemory.s similarity index 90% rename from asm/non_matchings/code/audio_heap/Audio_SoundAlloc.s rename to asm/non_matchings/code/audio_heap/Audio_AllocDmaMemory.s index 80c8fc6102..47b2007521 100644 --- a/asm/non_matchings/code/audio_heap/Audio_SoundAlloc.s +++ b/asm/non_matchings/code/audio_heap/Audio_AllocDmaMemory.s @@ -1,7 +1,7 @@ -glabel Audio_SoundAlloc +glabel Audio_AllocDmaMemory /* B554A8 800DE308 27BDFFE0 */ addiu $sp, $sp, -0x20 /* B554AC 800DE30C AFBF0014 */ sw $ra, 0x14($sp) -/* B554B0 800DE310 0C0378F7 */ jal func_800DE3DC +/* B554B0 800DE310 0C0378F7 */ jal Audio_Alloc /* B554B4 800DE314 AFA50024 */ sw $a1, 0x24($sp) /* B554B8 800DE318 10400005 */ beqz $v0, .L800DE330 /* B554BC 800DE31C 00402025 */ move $a0, $v0 diff --git a/asm/non_matchings/code/audio_heap/func_800DE380.s b/asm/non_matchings/code/audio_heap/Audio_AllocZeroed.s similarity index 93% rename from asm/non_matchings/code/audio_heap/func_800DE380.s rename to asm/non_matchings/code/audio_heap/Audio_AllocZeroed.s index cf59907563..a7bc257b7b 100644 --- a/asm/non_matchings/code/audio_heap/func_800DE380.s +++ b/asm/non_matchings/code/audio_heap/Audio_AllocZeroed.s @@ -1,7 +1,7 @@ -glabel func_800DE380 +glabel Audio_AllocZeroed /* B55520 800DE380 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B55524 800DE384 AFBF0014 */ sw $ra, 0x14($sp) -/* B55528 800DE388 0C0378F7 */ jal func_800DE3DC +/* B55528 800DE388 0C0378F7 */ jal Audio_Alloc /* B5552C 800DE38C AFA40018 */ sw $a0, 0x18($sp) /* B55530 800DE390 8FA40018 */ lw $a0, 0x18($sp) /* B55534 800DE394 1040000C */ beqz $v0, .L800DE3C8 diff --git a/asm/non_matchings/code/audio_heap/Audio_InitMainPools.s b/asm/non_matchings/code/audio_heap/Audio_InitMainPools.s new file mode 100644 index 0000000000..96a4432375 --- /dev/null +++ b/asm/non_matchings/code/audio_heap/Audio_InitMainPools.s @@ -0,0 +1,26 @@ +glabel Audio_InitMainPools +/* B55790 800DE5F0 27BDFFE8 */ addiu $sp, $sp, -0x18 +/* B55794 800DE5F4 00803025 */ move $a2, $a0 +/* B55798 800DE5F8 AFBF0014 */ sw $ra, 0x14($sp) +/* B5579C 800DE5FC 3C048017 */ lui $a0, %hi(gAudioContext+0x29b0) # $a0, 0x8017 +/* B557A0 800DE600 3C058017 */ lui $a1, %hi(gAudioContext+0x3524) # $a1, 0x8017 +/* B557A4 800DE604 8CA526A4 */ lw $a1, %lo(gAudioContext+0x3524)($a1) +/* B557A8 800DE608 24841B30 */ addiu $a0, %lo(gAudioContext+0x29b0) # addiu $a0, $a0, 0x1b30 +/* B557AC 800DE60C 0C03790D */ jal Audio_SoundAllocPoolInit +/* B557B0 800DE610 AFA60018 */ sw $a2, 0x18($sp) +/* B557B4 800DE614 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 +/* B557B8 800DE618 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 +/* B557BC 800DE61C 8FA70018 */ lw $a3, 0x18($sp) +/* B557C0 800DE620 8C4E3524 */ lw $t6, 0x3524($v0) +/* B557C4 800DE624 8C4F3528 */ lw $t7, 0x3528($v0) +/* B557C8 800DE628 3C048017 */ lui $a0, %hi(gAudioContext+0x2990) # $a0, 0x8017 +/* B557CC 800DE62C 24841B10 */ addiu $a0, %lo(gAudioContext+0x2990) # addiu $a0, $a0, 0x1b10 +/* B557D0 800DE630 01C72821 */ addu $a1, $t6, $a3 +/* B557D4 800DE634 0C03790D */ jal Audio_SoundAllocPoolInit +/* B557D8 800DE638 01E73023 */ subu $a2, $t7, $a3 +/* B557DC 800DE63C 8FBF0014 */ lw $ra, 0x14($sp) +/* B557E0 800DE640 3C018017 */ lui $at, %hi(gAudioContext+0x29a0) # $at, 0x8017 +/* B557E4 800DE644 AC201B20 */ sw $zero, %lo(gAudioContext+0x29a0)($at) +/* B557E8 800DE648 03E00008 */ jr $ra +/* B557EC 800DE64C 27BD0018 */ addiu $sp, $sp, 0x18 + diff --git a/asm/non_matchings/code/audio_heap/func_800DE45C.s b/asm/non_matchings/code/audio_heap/Audio_PersistentPoolClear.s similarity index 88% rename from asm/non_matchings/code/audio_heap/func_800DE45C.s rename to asm/non_matchings/code/audio_heap/Audio_PersistentPoolClear.s index f50ddd0ea6..1c418fc681 100644 --- a/asm/non_matchings/code/audio_heap/func_800DE45C.s +++ b/asm/non_matchings/code/audio_heap/Audio_PersistentPoolClear.s @@ -1,4 +1,4 @@ -glabel func_800DE45C +glabel Audio_PersistentPoolClear /* B555FC 800DE45C 8C8E0004 */ lw $t6, 4($a0) /* B55600 800DE460 AC800010 */ sw $zero, 0x10($a0) /* B55604 800DE464 AC800000 */ sw $zero, ($a0) diff --git a/asm/non_matchings/code/audio_heap/Audio_PersistentPoolsInit.s b/asm/non_matchings/code/audio_heap/Audio_PersistentPoolsInit.s new file mode 100644 index 0000000000..fccda65a66 --- /dev/null +++ b/asm/non_matchings/code/audio_heap/Audio_PersistentPoolsInit.s @@ -0,0 +1,51 @@ +glabel Audio_PersistentPoolsInit +/* B558F8 800DE758 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 +/* B558FC 800DE75C 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 +/* B55900 800DE760 8C4E2A00 */ lw $t6, 0x2a00($v0) +/* B55904 800DE764 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B55908 800DE768 AFB00018 */ sw $s0, 0x18($sp) +/* B5590C 800DE76C 00808025 */ move $s0, $a0 +/* B55910 800DE770 AFBF001C */ sw $ra, 0x1c($sp) +/* B55914 800DE774 3C048017 */ lui $a0, %hi(gAudioContext+0x2a00) # $a0, 0x8017 +/* B55918 800DE778 AC4E2A04 */ sw $t6, 0x2a04($v0) +/* B5591C 800DE77C 8E050000 */ lw $a1, ($s0) +/* B55920 800DE780 0C0378F7 */ jal Audio_Alloc +/* B55924 800DE784 24841B80 */ addiu $a0, %lo(gAudioContext+0x2a00) # addiu $a0, $a0, 0x1b80 +/* B55928 800DE788 3C048017 */ lui $a0, %hi(gAudioContext+0x2a24) # $a0, 0x8017 +/* B5592C 800DE78C 24841BA4 */ addiu $a0, %lo(gAudioContext+0x2a24) # addiu $a0, $a0, 0x1ba4 +/* B55930 800DE790 00402825 */ move $a1, $v0 +/* B55934 800DE794 0C03790D */ jal Audio_SoundAllocPoolInit +/* B55938 800DE798 8E060000 */ lw $a2, ($s0) +/* B5593C 800DE79C 3C048017 */ lui $a0, %hi(gAudioContext+0x2a00) # $a0, 0x8017 +/* B55940 800DE7A0 24841B80 */ addiu $a0, %lo(gAudioContext+0x2a00) # addiu $a0, $a0, 0x1b80 +/* B55944 800DE7A4 0C0378F7 */ jal Audio_Alloc +/* B55948 800DE7A8 8E050004 */ lw $a1, 4($s0) +/* B5594C 800DE7AC 3C048017 */ lui $a0, %hi(gAudioContext+0x2b34) # $a0, 0x8017 +/* B55950 800DE7B0 24841CB4 */ addiu $a0, %lo(gAudioContext+0x2b34) # addiu $a0, $a0, 0x1cb4 +/* B55954 800DE7B4 00402825 */ move $a1, $v0 +/* B55958 800DE7B8 0C03790D */ jal Audio_SoundAllocPoolInit +/* B5595C 800DE7BC 8E060004 */ lw $a2, 4($s0) +/* B55960 800DE7C0 3C048017 */ lui $a0, %hi(gAudioContext+0x2a00) # $a0, 0x8017 +/* B55964 800DE7C4 24841B80 */ addiu $a0, %lo(gAudioContext+0x2a00) # addiu $a0, $a0, 0x1b80 +/* B55968 800DE7C8 0C0378F7 */ jal Audio_Alloc +/* B5596C 800DE7CC 8E050008 */ lw $a1, 8($s0) +/* B55970 800DE7D0 3C048017 */ lui $a0, %hi(gAudioContext+0x2c44) # $a0, 0x8017 +/* B55974 800DE7D4 24841DC4 */ addiu $a0, %lo(gAudioContext+0x2c44) # addiu $a0, $a0, 0x1dc4 +/* B55978 800DE7D8 00402825 */ move $a1, $v0 +/* B5597C 800DE7DC 0C03790D */ jal Audio_SoundAllocPoolInit +/* B55980 800DE7E0 8E060008 */ lw $a2, 8($s0) +/* B55984 800DE7E4 3C048017 */ lui $a0, %hi(gAudioContext+0x2a20) # $a0, 0x8017 +/* B55988 800DE7E8 0C037917 */ jal Audio_PersistentPoolClear +/* B5598C 800DE7EC 24841BA0 */ addiu $a0, %lo(gAudioContext+0x2a20) # addiu $a0, $a0, 0x1ba0 +/* B55990 800DE7F0 3C048017 */ lui $a0, %hi(gAudioContext+0x2b30) # $a0, 0x8017 +/* B55994 800DE7F4 0C037917 */ jal Audio_PersistentPoolClear +/* B55998 800DE7F8 24841CB0 */ addiu $a0, %lo(gAudioContext+0x2b30) # addiu $a0, $a0, 0x1cb0 +/* B5599C 800DE7FC 3C048017 */ lui $a0, %hi(gAudioContext+0x2c40) # $a0, 0x8017 +/* B559A0 800DE800 0C037917 */ jal Audio_PersistentPoolClear +/* B559A4 800DE804 24841DC0 */ addiu $a0, %lo(gAudioContext+0x2c40) # addiu $a0, $a0, 0x1dc0 +/* B559A8 800DE808 8FBF001C */ lw $ra, 0x1c($sp) +/* B559AC 800DE80C 8FB00018 */ lw $s0, 0x18($sp) +/* B559B0 800DE810 27BD0020 */ addiu $sp, $sp, 0x20 +/* B559B4 800DE814 03E00008 */ jr $ra +/* B559B8 800DE818 00000000 */ nop + diff --git a/asm/non_matchings/code/audio_heap/func_800DE6D4.s b/asm/non_matchings/code/audio_heap/Audio_SeqAndBankPoolInit.s similarity index 53% rename from asm/non_matchings/code/audio_heap/func_800DE6D4.s rename to asm/non_matchings/code/audio_heap/Audio_SeqAndBankPoolInit.s index bae19599dd..b5a6590575 100644 --- a/asm/non_matchings/code/audio_heap/func_800DE6D4.s +++ b/asm/non_matchings/code/audio_heap/Audio_SeqAndBankPoolInit.s @@ -1,4 +1,4 @@ -glabel func_800DE6D4 +glabel Audio_SeqAndBankPoolInit /* B55874 800DE6D4 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 /* B55878 800DE6D8 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 /* B5587C 800DE6DC 8C4E29F0 */ lw $t6, 0x29f0($v0) @@ -6,27 +6,27 @@ glabel func_800DE6D4 /* B55884 800DE6E4 AFA40018 */ sw $a0, 0x18($sp) /* B55888 800DE6E8 8FAF0018 */ lw $t7, 0x18($sp) /* B5588C 800DE6EC AFBF0014 */ sw $ra, 0x14($sp) -/* B55890 800DE6F0 3C048017 */ lui $a0, %hi(D_80171B70) # $a0, 0x8017 +/* B55890 800DE6F0 3C048017 */ lui $a0, %hi(gAudioContext+0x29f0) # $a0, 0x8017 /* B55894 800DE6F4 AC4E29F4 */ sw $t6, 0x29f4($v0) -/* B55898 800DE6F8 24841B70 */ addiu $a0, %lo(D_80171B70) # addiu $a0, $a0, 0x1b70 -/* B5589C 800DE6FC 0C0378F7 */ jal func_800DE3DC +/* B55898 800DE6F8 24841B70 */ addiu $a0, %lo(gAudioContext+0x29f0) # addiu $a0, $a0, 0x1b70 +/* B5589C 800DE6FC 0C0378F7 */ jal Audio_Alloc /* B558A0 800DE700 8DE50000 */ lw $a1, ($t7) /* B558A4 800DE704 8FB80018 */ lw $t8, 0x18($sp) -/* B558A8 800DE708 3C048017 */ lui $a0, %hi(D_80171B80) # $a0, 0x8017 -/* B558AC 800DE70C 24841B80 */ addiu $a0, %lo(D_80171B80) # addiu $a0, $a0, 0x1b80 +/* B558A8 800DE708 3C048017 */ lui $a0, %hi(gAudioContext+0x2a00) # $a0, 0x8017 +/* B558AC 800DE70C 24841B80 */ addiu $a0, %lo(gAudioContext+0x2a00) # addiu $a0, $a0, 0x1b80 /* B558B0 800DE710 00402825 */ move $a1, $v0 -/* B558B4 800DE714 0C03790D */ jal func_800DE434 +/* B558B4 800DE714 0C03790D */ jal Audio_SoundAllocPoolInit /* B558B8 800DE718 8F060000 */ lw $a2, ($t8) /* B558BC 800DE71C 8FB90018 */ lw $t9, 0x18($sp) -/* B558C0 800DE720 3C048017 */ lui $a0, %hi(D_80171B70) # $a0, 0x8017 -/* B558C4 800DE724 24841B70 */ addiu $a0, %lo(D_80171B70) # addiu $a0, $a0, 0x1b70 -/* B558C8 800DE728 0C0378F7 */ jal func_800DE3DC +/* B558C0 800DE720 3C048017 */ lui $a0, %hi(gAudioContext+0x29f0) # $a0, 0x8017 +/* B558C4 800DE724 24841B70 */ addiu $a0, %lo(gAudioContext+0x29f0) # addiu $a0, $a0, 0x1b70 +/* B558C8 800DE728 0C0378F7 */ jal Audio_Alloc /* B558CC 800DE72C 8F250004 */ lw $a1, 4($t9) /* B558D0 800DE730 8FA80018 */ lw $t0, 0x18($sp) -/* B558D4 800DE734 3C048017 */ lui $a0, %hi(D_80171B90) # $a0, 0x8017 -/* B558D8 800DE738 24841B90 */ addiu $a0, %lo(D_80171B90) # addiu $a0, $a0, 0x1b90 +/* B558D4 800DE734 3C048017 */ lui $a0, %hi(gAudioContext+0x2a10) # $a0, 0x8017 +/* B558D8 800DE738 24841B90 */ addiu $a0, %lo(gAudioContext+0x2a10) # addiu $a0, $a0, 0x1b90 /* B558DC 800DE73C 00402825 */ move $a1, $v0 -/* B558E0 800DE740 0C03790D */ jal func_800DE434 +/* B558E0 800DE740 0C03790D */ jal Audio_SoundAllocPoolInit /* B558E4 800DE744 8D060004 */ lw $a2, 4($t0) /* B558E8 800DE748 8FBF0014 */ lw $ra, 0x14($sp) /* B558EC 800DE74C 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/code/audio_heap/func_800DE650.s b/asm/non_matchings/code/audio_heap/Audio_SessionPoolsInit.s similarity index 54% rename from asm/non_matchings/code/audio_heap/func_800DE650.s rename to asm/non_matchings/code/audio_heap/Audio_SessionPoolsInit.s index 9c09f014a4..ff9b330830 100644 --- a/asm/non_matchings/code/audio_heap/func_800DE650.s +++ b/asm/non_matchings/code/audio_heap/Audio_SessionPoolsInit.s @@ -1,4 +1,4 @@ -glabel func_800DE650 +glabel Audio_SessionPoolsInit /* B557F0 800DE650 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 /* B557F4 800DE654 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 /* B557F8 800DE658 8C4E2990 */ lw $t6, 0x2990($v0) @@ -6,27 +6,27 @@ glabel func_800DE650 /* B55800 800DE660 AFA40018 */ sw $a0, 0x18($sp) /* B55804 800DE664 8FAF0018 */ lw $t7, 0x18($sp) /* B55808 800DE668 AFBF0014 */ sw $ra, 0x14($sp) -/* B5580C 800DE66C 3C048017 */ lui $a0, %hi(D_80171B10) # $a0, 0x8017 +/* B5580C 800DE66C 3C048017 */ lui $a0, %hi(gAudioContext+0x2990) # $a0, 0x8017 /* B55810 800DE670 AC4E2994 */ sw $t6, 0x2994($v0) -/* B55814 800DE674 24841B10 */ addiu $a0, %lo(D_80171B10) # addiu $a0, $a0, 0x1b10 -/* B55818 800DE678 0C0378F7 */ jal func_800DE3DC +/* B55814 800DE674 24841B10 */ addiu $a0, %lo(gAudioContext+0x2990) # addiu $a0, $a0, 0x1b10 +/* B55818 800DE678 0C0378F7 */ jal Audio_Alloc /* B5581C 800DE67C 8DE50000 */ lw $a1, ($t7) /* B55820 800DE680 8FB80018 */ lw $t8, 0x18($sp) -/* B55824 800DE684 3C048017 */ lui $a0, %hi(D_80171B40) # $a0, 0x8017 -/* B55828 800DE688 24841B40 */ addiu $a0, %lo(D_80171B40) # addiu $a0, $a0, 0x1b40 +/* B55824 800DE684 3C048017 */ lui $a0, %hi(gAudioContext+0x29c0) # $a0, 0x8017 +/* B55828 800DE688 24841B40 */ addiu $a0, %lo(gAudioContext+0x29c0) # addiu $a0, $a0, 0x1b40 /* B5582C 800DE68C 00402825 */ move $a1, $v0 -/* B55830 800DE690 0C03790D */ jal func_800DE434 +/* B55830 800DE690 0C03790D */ jal Audio_SoundAllocPoolInit /* B55834 800DE694 8F060000 */ lw $a2, ($t8) /* B55838 800DE698 8FB90018 */ lw $t9, 0x18($sp) -/* B5583C 800DE69C 3C048017 */ lui $a0, %hi(D_80171B10) # $a0, 0x8017 -/* B55840 800DE6A0 24841B10 */ addiu $a0, %lo(D_80171B10) # addiu $a0, $a0, 0x1b10 -/* B55844 800DE6A4 0C0378F7 */ jal func_800DE3DC +/* B5583C 800DE69C 3C048017 */ lui $a0, %hi(gAudioContext+0x2990) # $a0, 0x8017 +/* B55840 800DE6A0 24841B10 */ addiu $a0, %lo(gAudioContext+0x2990) # addiu $a0, $a0, 0x1b10 +/* B55844 800DE6A4 0C0378F7 */ jal Audio_Alloc /* B55848 800DE6A8 8F25000C */ lw $a1, 0xc($t9) /* B5584C 800DE6AC 8FA80018 */ lw $t0, 0x18($sp) -/* B55850 800DE6B0 3C048017 */ lui $a0, %hi(D_80171B70) # $a0, 0x8017 -/* B55854 800DE6B4 24841B70 */ addiu $a0, %lo(D_80171B70) # addiu $a0, $a0, 0x1b70 +/* B55850 800DE6B0 3C048017 */ lui $a0, %hi(gAudioContext+0x29f0) # $a0, 0x8017 +/* B55854 800DE6B4 24841B70 */ addiu $a0, %lo(gAudioContext+0x29f0) # addiu $a0, $a0, 0x1b70 /* B55858 800DE6B8 00402825 */ move $a1, $v0 -/* B5585C 800DE6BC 0C03790D */ jal func_800DE434 +/* B5585C 800DE6BC 0C03790D */ jal Audio_SoundAllocPoolInit /* B55860 800DE6C0 8D06000C */ lw $a2, 0xc($t0) /* B55864 800DE6C4 8FBF0014 */ lw $ra, 0x14($sp) /* B55868 800DE6C8 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/code/audio_heap/func_800DE434.s b/asm/non_matchings/code/audio_heap/Audio_SoundAllocPoolInit.s similarity index 94% rename from asm/non_matchings/code/audio_heap/func_800DE434.s rename to asm/non_matchings/code/audio_heap/Audio_SoundAllocPoolInit.s index c80b453fd9..e66f114661 100644 --- a/asm/non_matchings/code/audio_heap/func_800DE434.s +++ b/asm/non_matchings/code/audio_heap/Audio_SoundAllocPoolInit.s @@ -1,4 +1,4 @@ -glabel func_800DE434 +glabel Audio_SoundAllocPoolInit /* B555D4 800DE434 24A2000F */ addiu $v0, $a1, 0xf /* B555D8 800DE438 2401FFF0 */ li $at, -16 /* B555DC 800DE43C 30AE000F */ andi $t6, $a1, 0xf diff --git a/asm/non_matchings/code/audio_heap/func_800DE470.s b/asm/non_matchings/code/audio_heap/Audio_TemporaryPoolClear.s similarity index 95% rename from asm/non_matchings/code/audio_heap/func_800DE470.s rename to asm/non_matchings/code/audio_heap/Audio_TemporaryPoolClear.s index fc8ed498c1..6f233e71fc 100644 --- a/asm/non_matchings/code/audio_heap/func_800DE470.s +++ b/asm/non_matchings/code/audio_heap/Audio_TemporaryPoolClear.s @@ -1,4 +1,4 @@ -glabel func_800DE470 +glabel Audio_TemporaryPoolClear /* B55610 800DE470 8C820004 */ lw $v0, 4($a0) /* B55614 800DE474 8C8E000C */ lw $t6, 0xc($a0) /* B55618 800DE478 2403FFFF */ li $v1, -1 diff --git a/asm/non_matchings/code/audio_heap/Audio_TemporaryPoolsInit.s b/asm/non_matchings/code/audio_heap/Audio_TemporaryPoolsInit.s new file mode 100644 index 0000000000..7f24e4476d --- /dev/null +++ b/asm/non_matchings/code/audio_heap/Audio_TemporaryPoolsInit.s @@ -0,0 +1,51 @@ +glabel Audio_TemporaryPoolsInit +/* B559BC 800DE81C 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 +/* B559C0 800DE820 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 +/* B559C4 800DE824 8C4E2A10 */ lw $t6, 0x2a10($v0) +/* B559C8 800DE828 27BDFFE0 */ addiu $sp, $sp, -0x20 +/* B559CC 800DE82C AFB00018 */ sw $s0, 0x18($sp) +/* B559D0 800DE830 00808025 */ move $s0, $a0 +/* B559D4 800DE834 AFBF001C */ sw $ra, 0x1c($sp) +/* B559D8 800DE838 3C048017 */ lui $a0, %hi(gAudioContext+0x2a10) # $a0, 0x8017 +/* B559DC 800DE83C AC4E2A14 */ sw $t6, 0x2a14($v0) +/* B559E0 800DE840 8E050000 */ lw $a1, ($s0) +/* B559E4 800DE844 0C0378F7 */ jal Audio_Alloc +/* B559E8 800DE848 24841B90 */ addiu $a0, %lo(gAudioContext+0x2a10) # addiu $a0, $a0, 0x1b90 +/* B559EC 800DE84C 3C048017 */ lui $a0, %hi(gAudioContext+0x2af8) # $a0, 0x8017 +/* B559F0 800DE850 24841C78 */ addiu $a0, %lo(gAudioContext+0x2af8) # addiu $a0, $a0, 0x1c78 +/* B559F4 800DE854 00402825 */ move $a1, $v0 +/* B559F8 800DE858 0C03790D */ jal Audio_SoundAllocPoolInit +/* B559FC 800DE85C 8E060000 */ lw $a2, ($s0) +/* B55A00 800DE860 3C048017 */ lui $a0, %hi(gAudioContext+0x2a10) # $a0, 0x8017 +/* B55A04 800DE864 24841B90 */ addiu $a0, %lo(gAudioContext+0x2a10) # addiu $a0, $a0, 0x1b90 +/* B55A08 800DE868 0C0378F7 */ jal Audio_Alloc +/* B55A0C 800DE86C 8E050004 */ lw $a1, 4($s0) +/* B55A10 800DE870 3C048017 */ lui $a0, %hi(gAudioContext+0x2c08) # $a0, 0x8017 +/* B55A14 800DE874 24841D88 */ addiu $a0, %lo(gAudioContext+0x2c08) # addiu $a0, $a0, 0x1d88 +/* B55A18 800DE878 00402825 */ move $a1, $v0 +/* B55A1C 800DE87C 0C03790D */ jal Audio_SoundAllocPoolInit +/* B55A20 800DE880 8E060004 */ lw $a2, 4($s0) +/* B55A24 800DE884 3C048017 */ lui $a0, %hi(gAudioContext+0x2a10) # $a0, 0x8017 +/* B55A28 800DE888 24841B90 */ addiu $a0, %lo(gAudioContext+0x2a10) # addiu $a0, $a0, 0x1b90 +/* B55A2C 800DE88C 0C0378F7 */ jal Audio_Alloc +/* B55A30 800DE890 8E050008 */ lw $a1, 8($s0) +/* B55A34 800DE894 3C048017 */ lui $a0, %hi(gAudioContext+0x2d18) # $a0, 0x8017 +/* B55A38 800DE898 24841E98 */ addiu $a0, %lo(gAudioContext+0x2d18) # addiu $a0, $a0, 0x1e98 +/* B55A3C 800DE89C 00402825 */ move $a1, $v0 +/* B55A40 800DE8A0 0C03790D */ jal Audio_SoundAllocPoolInit +/* B55A44 800DE8A4 8E060008 */ lw $a2, 8($s0) +/* B55A48 800DE8A8 3C048017 */ lui $a0, %hi(gAudioContext+0x2af4) # $a0, 0x8017 +/* B55A4C 800DE8AC 0C03791C */ jal Audio_TemporaryPoolClear +/* B55A50 800DE8B0 24841C74 */ addiu $a0, %lo(gAudioContext+0x2af4) # addiu $a0, $a0, 0x1c74 +/* B55A54 800DE8B4 3C048017 */ lui $a0, %hi(gAudioContext+0x2c04) # $a0, 0x8017 +/* B55A58 800DE8B8 0C03791C */ jal Audio_TemporaryPoolClear +/* B55A5C 800DE8BC 24841D84 */ addiu $a0, %lo(gAudioContext+0x2c04) # addiu $a0, $a0, 0x1d84 +/* B55A60 800DE8C0 3C048017 */ lui $a0, %hi(gAudioContext+0x2d14) # $a0, 0x8017 +/* B55A64 800DE8C4 0C03791C */ jal Audio_TemporaryPoolClear +/* B55A68 800DE8C8 24841E94 */ addiu $a0, %lo(gAudioContext+0x2d14) # addiu $a0, $a0, 0x1e94 +/* B55A6C 800DE8CC 8FBF001C */ lw $ra, 0x1c($sp) +/* B55A70 800DE8D0 8FB00018 */ lw $s0, 0x18($sp) +/* B55A74 800DE8D4 27BD0020 */ addiu $sp, $sp, 0x20 +/* B55A78 800DE8D8 03E00008 */ jr $ra +/* B55A7C 800DE8DC 00000000 */ nop + diff --git a/asm/non_matchings/code/audio_heap/func_800DDE20.s b/asm/non_matchings/code/audio_heap/func_800DDE20.s index 36d8dec781..6ed91b3a7d 100644 --- a/asm/non_matchings/code/audio_heap/func_800DDE20.s +++ b/asm/non_matchings/code/audio_heap/func_800DDE20.s @@ -1,8 +1,8 @@ glabel func_800DDE20 /* B54FC0 800DDE20 3C014380 */ li $at, 0x43800000 # 0.000000 /* B54FC4 800DDE24 44812000 */ mtc1 $at, $f4 -/* B54FC8 800DDE28 3C018017 */ lui $at, %hi(D_801719E8) -/* B54FCC 800DDE2C C42619E8 */ lwc1 $f6, %lo(D_801719E8)($at) +/* B54FC8 800DDE28 3C018017 */ lui $at, %hi(gAudioContext+0x2868) +/* B54FCC 800DDE2C C42619E8 */ lwc1 $f6, %lo(gAudioContext+0x2868)($at) /* B54FD0 800DDE30 46062202 */ mul.s $f8, $f4, $f6 /* B54FD4 800DDE34 03E00008 */ jr $ra /* B54FD8 800DDE38 460C4003 */ div.s $f0, $f8, $f12 diff --git a/asm/non_matchings/code/audio_heap/func_800DDF80.s b/asm/non_matchings/code/audio_heap/func_800DDF80.s index a94310f3ca..fa6a373c65 100644 --- a/asm/non_matchings/code/audio_heap/func_800DDF80.s +++ b/asm/non_matchings/code/audio_heap/func_800DDF80.s @@ -1,7 +1,7 @@ glabel func_800DDF80 /* B55120 800DDF80 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 -/* B55124 800DDF84 3C028017 */ lui $v0, %hi(D_8016F1B0) # $v0, 0x8017 -/* B55128 800DDF88 2442F1B0 */ addiu $v0, %lo(D_8016F1B0) # addiu $v0, $v0, -0xe50 +/* B55124 800DDF84 3C028017 */ lui $v0, %hi(gAudioContext+0x30) # $v0, 0x8017 +/* B55128 800DDF88 2442F1B0 */ addiu $v0, %lo(gAudioContext+0x30) # addiu $v0, $v0, -0xe50 /* B5512C 800DDF8C 2463F180 */ addiu $v1, %lo(gAudioContext) # addiu $v1, $v1, -0xe80 /* B55130 800DDF90 24040005 */ li $a0, 5 /* B55134 800DDF94 906E3468 */ lbu $t6, 0x3468($v1) @@ -15,8 +15,8 @@ glabel func_800DDF80 /* B5514C 800DDFAC 5420FFFA */ bnezl $at, .L800DDF98 /* B55150 800DDFB0 906E3468 */ lbu $t6, 0x3468($v1) /* B55154 800DDFB4 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 -/* B55158 800DDFB8 3C028017 */ lui $v0, %hi(D_8016F1B0) # $v0, 0x8017 -/* B5515C 800DDFBC 2442F1B0 */ addiu $v0, %lo(D_8016F1B0) # addiu $v0, $v0, -0xe50 +/* B55158 800DDFB8 3C028017 */ lui $v0, %hi(gAudioContext+0x30) # $v0, 0x8017 +/* B5515C 800DDFBC 2442F1B0 */ addiu $v0, %lo(gAudioContext+0x30) # addiu $v0, $v0, -0xe50 /* B55160 800DDFC0 2463F180 */ addiu $v1, %lo(gAudioContext) # addiu $v1, $v1, -0xe80 /* B55164 800DDFC4 906F3438 */ lbu $t7, 0x3438($v1) .L800DDFC8: @@ -29,8 +29,8 @@ glabel func_800DDF80 /* B5517C 800DDFDC 5420FFFA */ bnezl $at, .L800DDFC8 /* B55180 800DDFE0 906F3438 */ lbu $t7, 0x3438($v1) /* B55184 800DDFE4 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 -/* B55188 800DDFE8 3C028017 */ lui $v0, %hi(D_8016F200) # $v0, 0x8017 -/* B5518C 800DDFEC 2442F200 */ addiu $v0, %lo(D_8016F200) # addiu $v0, $v0, -0xe00 +/* B55188 800DDFE8 3C028017 */ lui $v0, %hi(gAudioContext+0x80) # $v0, 0x8017 +/* B5518C 800DDFEC 2442F200 */ addiu $v0, %lo(gAudioContext+0x80) # addiu $v0, $v0, -0xe00 /* B55190 800DDFF0 2463F180 */ addiu $v1, %lo(gAudioContext) # addiu $v1, $v1, -0xe80 /* B55194 800DDFF4 90783498 */ lbu $t8, 0x3498($v1) .L800DDFF8: diff --git a/asm/non_matchings/code/audio_heap/func_800DE1B4.s b/asm/non_matchings/code/audio_heap/func_800DE1B4.s index 9727bc14b3..d22a3d5f4a 100644 --- a/asm/non_matchings/code/audio_heap/func_800DE1B4.s +++ b/asm/non_matchings/code/audio_heap/func_800DE1B4.s @@ -1,6 +1,6 @@ glabel func_800DE1B4 -/* B55354 800DE1B4 3C028017 */ lui $v0, %hi(D_801719DC) # $v0, 0x8017 -/* B55358 800DE1B8 844219DC */ lh $v0, %lo(D_801719DC)($v0) +/* B55354 800DE1B4 3C028017 */ lui $v0, %hi(gAudioContext+0x285c) # $v0, 0x8017 +/* B55358 800DE1B8 844219DC */ lh $v0, %lo(gAudioContext+0x285c)($v0) /* B5535C 800DE1BC 27BDFFD8 */ addiu $sp, $sp, -0x28 /* B55360 800DE1C0 AFB20020 */ sw $s2, 0x20($sp) /* B55364 800DE1C4 AFB1001C */ sw $s1, 0x1c($sp) @@ -21,8 +21,8 @@ glabel func_800DE1B4 /* B5539C 800DE1FC 26310001 */ addiu $s1, $s1, 1 /* B553A0 800DE200 0C03A6DB */ jal Audio_SequencePlayerDisable /* B553A4 800DE204 26043530 */ addiu $a0, $s0, 0x3530 -/* B553A8 800DE208 3C028017 */ lui $v0, %hi(D_801719DC) # $v0, 0x8017 -/* B553AC 800DE20C 844219DC */ lh $v0, %lo(D_801719DC)($v0) +/* B553A8 800DE208 3C028017 */ lui $v0, %hi(gAudioContext+0x285c) # $v0, 0x8017 +/* B553AC 800DE20C 844219DC */ lh $v0, %lo(gAudioContext+0x285c)($v0) /* B553B0 800DE210 26310001 */ addiu $s1, $s1, 1 .L800DE214: /* B553B4 800DE214 0222082A */ slt $at, $s1, $v0 diff --git a/asm/non_matchings/code/audio_heap/func_800DE258.s b/asm/non_matchings/code/audio_heap/func_800DE258.s index 5882531773..040e3305bb 100644 --- a/asm/non_matchings/code/audio_heap/func_800DE258.s +++ b/asm/non_matchings/code/audio_heap/func_800DE258.s @@ -1,20 +1,20 @@ glabel func_800DE258 -/* B553F8 800DE258 3C0E8017 */ lui $t6, %hi(D_80171B20) # $t6, 0x8017 -/* B553FC 800DE25C 8DCE1B20 */ lw $t6, %lo(D_80171B20)($t6) +/* B553F8 800DE258 3C0E8017 */ lui $t6, %hi(gAudioContext+0x29a0) # $t6, 0x8017 +/* B553FC 800DE25C 8DCE1B20 */ lw $t6, %lo(gAudioContext+0x29a0)($t6) /* B55400 800DE260 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B55404 800DE264 AFBF0014 */ sw $ra, 0x14($sp) /* B55408 800DE268 AFA40018 */ sw $a0, 0x18($sp) /* B5540C 800DE26C AFA5001C */ sw $a1, 0x1c($sp) /* B55410 800DE270 11C00005 */ beqz $t6, .L800DE288 /* B55414 800DE274 00001825 */ move $v1, $zero -/* B55418 800DE278 3C048017 */ lui $a0, %hi(D_80171B20) # $a0, 0x8017 -/* B5541C 800DE27C 0C0378E0 */ jal func_800DE380 -/* B55420 800DE280 24841B20 */ addiu $a0, %lo(D_80171B20) # addiu $a0, $a0, 0x1b20 +/* B55418 800DE278 3C048017 */ lui $a0, %hi(gAudioContext+0x29a0) # $a0, 0x8017 +/* B5541C 800DE27C 0C0378E0 */ jal Audio_AllocZeroed +/* B55420 800DE280 24841B20 */ addiu $a0, %lo(gAudioContext+0x29a0) # addiu $a0, $a0, 0x1b20 /* B55424 800DE284 00401825 */ move $v1, $v0 .L800DE288: /* B55428 800DE288 14600004 */ bnez $v1, .L800DE29C /* B5542C 800DE28C 8FA40018 */ lw $a0, 0x18($sp) -/* B55430 800DE290 0C0378E0 */ jal func_800DE380 +/* B55430 800DE290 0C0378E0 */ jal Audio_AllocZeroed /* B55434 800DE294 8FA5001C */ lw $a1, 0x1c($sp) /* B55438 800DE298 00401825 */ move $v1, $v0 .L800DE29C: diff --git a/asm/non_matchings/code/audio_heap/func_800DE2B0.s b/asm/non_matchings/code/audio_heap/func_800DE2B0.s index 459b3e4cd7..b259d12f33 100644 --- a/asm/non_matchings/code/audio_heap/func_800DE2B0.s +++ b/asm/non_matchings/code/audio_heap/func_800DE2B0.s @@ -1,20 +1,20 @@ glabel func_800DE2B0 -/* B55450 800DE2B0 3C0E8017 */ lui $t6, %hi(D_80171B20) # $t6, 0x8017 -/* B55454 800DE2B4 8DCE1B20 */ lw $t6, %lo(D_80171B20)($t6) +/* B55450 800DE2B0 3C0E8017 */ lui $t6, %hi(gAudioContext+0x29a0) # $t6, 0x8017 +/* B55454 800DE2B4 8DCE1B20 */ lw $t6, %lo(gAudioContext+0x29a0)($t6) /* B55458 800DE2B8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B5545C 800DE2BC AFBF0014 */ sw $ra, 0x14($sp) /* B55460 800DE2C0 AFA40018 */ sw $a0, 0x18($sp) /* B55464 800DE2C4 AFA5001C */ sw $a1, 0x1c($sp) /* B55468 800DE2C8 11C00005 */ beqz $t6, .L800DE2E0 /* B5546C 800DE2CC 00001825 */ move $v1, $zero -/* B55470 800DE2D0 3C048017 */ lui $a0, %hi(D_80171B20) # $a0, 0x8017 -/* B55474 800DE2D4 0C0378F7 */ jal func_800DE3DC -/* B55478 800DE2D8 24841B20 */ addiu $a0, %lo(D_80171B20) # addiu $a0, $a0, 0x1b20 +/* B55470 800DE2D0 3C048017 */ lui $a0, %hi(gAudioContext+0x29a0) # $a0, 0x8017 +/* B55474 800DE2D4 0C0378F7 */ jal Audio_Alloc +/* B55478 800DE2D8 24841B20 */ addiu $a0, %lo(gAudioContext+0x29a0) # addiu $a0, $a0, 0x1b20 /* B5547C 800DE2DC 00401825 */ move $v1, $v0 .L800DE2E0: /* B55480 800DE2E0 14600004 */ bnez $v1, .L800DE2F4 /* B55484 800DE2E4 8FA40018 */ lw $a0, 0x18($sp) -/* B55488 800DE2E8 0C0378F7 */ jal func_800DE3DC +/* B55488 800DE2E8 0C0378F7 */ jal Audio_Alloc /* B5548C 800DE2EC 8FA5001C */ lw $a1, 0x1c($sp) /* B55490 800DE2F0 00401825 */ move $v1, $v0 .L800DE2F4: diff --git a/asm/non_matchings/code/audio_heap/func_800DE344.s b/asm/non_matchings/code/audio_heap/func_800DE344.s index b93ee2e7b0..189cc0f6f5 100644 --- a/asm/non_matchings/code/audio_heap/func_800DE344.s +++ b/asm/non_matchings/code/audio_heap/func_800DE344.s @@ -1,7 +1,7 @@ glabel func_800DE344 /* B554E4 800DE344 27BDFFE0 */ addiu $sp, $sp, -0x20 /* B554E8 800DE348 AFBF0014 */ sw $ra, 0x14($sp) -/* B554EC 800DE34C 0C0378E0 */ jal func_800DE380 +/* B554EC 800DE34C 0C0378E0 */ jal Audio_AllocZeroed /* B554F0 800DE350 AFA50024 */ sw $a1, 0x24($sp) /* B554F4 800DE354 10400005 */ beqz $v0, .L800DE36C /* B554F8 800DE358 00402025 */ move $a0, $v0 diff --git a/asm/non_matchings/code/audio_heap/func_800DE4B0.s b/asm/non_matchings/code/audio_heap/func_800DE4B0.s index a8d48f9f47..6c84cda114 100644 --- a/asm/non_matchings/code/audio_heap/func_800DE4B0.s +++ b/asm/non_matchings/code/audio_heap/func_800DE4B0.s @@ -5,29 +5,29 @@ glabel func_800DE4B0 /* B5565C 800DE4BC 00803025 */ move $a2, $a0 /* B55660 800DE4C0 24010001 */ li $at, 1 /* B55664 800DE4C4 1081000C */ beq $a0, $at, .L800DE4F8 -/* B55668 800DE4C8 3C038017 */ lui $v1, %hi(D_80171CB0) +/* B55668 800DE4C8 3C038017 */ lui $v1, %hi(gAudioContext+0x2b30) /* B5566C 800DE4CC 24010002 */ li $at, 2 /* B55670 800DE4D0 1081000E */ beq $a0, $at, .L800DE50C -/* B55674 800DE4D4 3C038017 */ lui $v1, %hi(D_80171DC0) +/* B55674 800DE4D4 3C038017 */ lui $v1, %hi(gAudioContext+0x2c40) /* B55678 800DE4D8 10000010 */ b .L800DE51C /* B5567C 800DE4DC 8FA3002C */ lw $v1, 0x2c($sp) .L800DE4E0: -/* B55680 800DE4E0 3C0E8017 */ lui $t6, %hi(D_80172618) # $t6, 0x8017 -/* B55684 800DE4E4 3C038017 */ lui $v1, %hi(D_80171BA0) # $v1, 0x8017 -/* B55688 800DE4E8 25CE2618 */ addiu $t6, %lo(D_80172618) # addiu $t6, $t6, 0x2618 -/* B5568C 800DE4EC 24631BA0 */ addiu $v1, %lo(D_80171BA0) # addiu $v1, $v1, 0x1ba0 +/* B55680 800DE4E0 3C0E8017 */ lui $t6, %hi(gAudioContext+0x3498) # $t6, 0x8017 +/* B55684 800DE4E4 3C038017 */ lui $v1, %hi(gAudioContext+0x2a20) # $v1, 0x8017 +/* B55688 800DE4E8 25CE2618 */ addiu $t6, %lo(gAudioContext+0x3498) # addiu $t6, $t6, 0x2618 +/* B5568C 800DE4EC 24631BA0 */ addiu $v1, %lo(gAudioContext+0x2a20) # addiu $v1, $v1, 0x1ba0 /* B55690 800DE4F0 1000000A */ b .L800DE51C /* B55694 800DE4F4 AFAE001C */ sw $t6, 0x1c($sp) .L800DE4F8: -/* B55698 800DE4F8 3C0F8017 */ lui $t7, %hi(D_801725E8) # $t7, 0x8017 -/* B5569C 800DE4FC 25EF25E8 */ addiu $t7, %lo(D_801725E8) # addiu $t7, $t7, 0x25e8 -/* B556A0 800DE500 24631CB0 */ addiu $v1, %lo(D_80171CB0) +/* B55698 800DE4F8 3C0F8017 */ lui $t7, %hi(gAudioContext+0x3468) # $t7, 0x8017 +/* B5569C 800DE4FC 25EF25E8 */ addiu $t7, %lo(gAudioContext+0x3468) # addiu $t7, $t7, 0x25e8 +/* B556A0 800DE500 24631CB0 */ addiu $v1, %lo(gAudioContext+0x2b30) /* B556A4 800DE504 10000005 */ b .L800DE51C /* B556A8 800DE508 AFAF001C */ sw $t7, 0x1c($sp) .L800DE50C: -/* B556AC 800DE50C 3C188017 */ lui $t8, %hi(D_801725B8) # $t8, 0x8017 -/* B556B0 800DE510 271825B8 */ addiu $t8, %lo(D_801725B8) # addiu $t8, $t8, 0x25b8 -/* B556B4 800DE514 24631DC0 */ addiu $v1, %lo(D_80171DC0) +/* B556AC 800DE50C 3C188017 */ lui $t8, %hi(gAudioContext+0x3438) # $t8, 0x8017 +/* B556B0 800DE510 271825B8 */ addiu $t8, %lo(gAudioContext+0x3438) # addiu $t8, $t8, 0x25b8 +/* B556B4 800DE514 24631DC0 */ addiu $v1, %lo(gAudioContext+0x2c40) /* B556B8 800DE518 AFB8001C */ sw $t8, 0x1c($sp) .L800DE51C: /* B556BC 800DE51C 8C650000 */ lw $a1, ($v1) diff --git a/asm/non_matchings/code/audio_heap/func_800DE5F0.s b/asm/non_matchings/code/audio_heap/func_800DE5F0.s deleted file mode 100644 index b2fe7d61aa..0000000000 --- a/asm/non_matchings/code/audio_heap/func_800DE5F0.s +++ /dev/null @@ -1,26 +0,0 @@ -glabel func_800DE5F0 -/* B55790 800DE5F0 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B55794 800DE5F4 00803025 */ move $a2, $a0 -/* B55798 800DE5F8 AFBF0014 */ sw $ra, 0x14($sp) -/* B5579C 800DE5FC 3C048017 */ lui $a0, %hi(D_80171B30) # $a0, 0x8017 -/* B557A0 800DE600 3C058017 */ lui $a1, %hi(D_801726A4) # $a1, 0x8017 -/* B557A4 800DE604 8CA526A4 */ lw $a1, %lo(D_801726A4)($a1) -/* B557A8 800DE608 24841B30 */ addiu $a0, %lo(D_80171B30) # addiu $a0, $a0, 0x1b30 -/* B557AC 800DE60C 0C03790D */ jal func_800DE434 -/* B557B0 800DE610 AFA60018 */ sw $a2, 0x18($sp) -/* B557B4 800DE614 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 -/* B557B8 800DE618 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 -/* B557BC 800DE61C 8FA70018 */ lw $a3, 0x18($sp) -/* B557C0 800DE620 8C4E3524 */ lw $t6, 0x3524($v0) -/* B557C4 800DE624 8C4F3528 */ lw $t7, 0x3528($v0) -/* B557C8 800DE628 3C048017 */ lui $a0, %hi(D_80171B10) # $a0, 0x8017 -/* B557CC 800DE62C 24841B10 */ addiu $a0, %lo(D_80171B10) # addiu $a0, $a0, 0x1b10 -/* B557D0 800DE630 01C72821 */ addu $a1, $t6, $a3 -/* B557D4 800DE634 0C03790D */ jal func_800DE434 -/* B557D8 800DE638 01E73023 */ subu $a2, $t7, $a3 -/* B557DC 800DE63C 8FBF0014 */ lw $ra, 0x14($sp) -/* B557E0 800DE640 3C018017 */ lui $at, %hi(D_80171B20) # $at, 0x8017 -/* B557E4 800DE644 AC201B20 */ sw $zero, %lo(D_80171B20)($at) -/* B557E8 800DE648 03E00008 */ jr $ra -/* B557EC 800DE64C 27BD0018 */ addiu $sp, $sp, 0x18 - diff --git a/asm/non_matchings/code/audio_heap/func_800DE758.s b/asm/non_matchings/code/audio_heap/func_800DE758.s deleted file mode 100644 index 04567350c0..0000000000 --- a/asm/non_matchings/code/audio_heap/func_800DE758.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_800DE758 -/* B558F8 800DE758 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 -/* B558FC 800DE75C 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 -/* B55900 800DE760 8C4E2A00 */ lw $t6, 0x2a00($v0) -/* B55904 800DE764 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B55908 800DE768 AFB00018 */ sw $s0, 0x18($sp) -/* B5590C 800DE76C 00808025 */ move $s0, $a0 -/* B55910 800DE770 AFBF001C */ sw $ra, 0x1c($sp) -/* B55914 800DE774 3C048017 */ lui $a0, %hi(D_80171B80) # $a0, 0x8017 -/* B55918 800DE778 AC4E2A04 */ sw $t6, 0x2a04($v0) -/* B5591C 800DE77C 8E050000 */ lw $a1, ($s0) -/* B55920 800DE780 0C0378F7 */ jal func_800DE3DC -/* B55924 800DE784 24841B80 */ addiu $a0, %lo(D_80171B80) # addiu $a0, $a0, 0x1b80 -/* B55928 800DE788 3C048017 */ lui $a0, %hi(D_80171BA4) # $a0, 0x8017 -/* B5592C 800DE78C 24841BA4 */ addiu $a0, %lo(D_80171BA4) # addiu $a0, $a0, 0x1ba4 -/* B55930 800DE790 00402825 */ move $a1, $v0 -/* B55934 800DE794 0C03790D */ jal func_800DE434 -/* B55938 800DE798 8E060000 */ lw $a2, ($s0) -/* B5593C 800DE79C 3C048017 */ lui $a0, %hi(D_80171B80) # $a0, 0x8017 -/* B55940 800DE7A0 24841B80 */ addiu $a0, %lo(D_80171B80) # addiu $a0, $a0, 0x1b80 -/* B55944 800DE7A4 0C0378F7 */ jal func_800DE3DC -/* B55948 800DE7A8 8E050004 */ lw $a1, 4($s0) -/* B5594C 800DE7AC 3C048017 */ lui $a0, %hi(D_80171CB4) # $a0, 0x8017 -/* B55950 800DE7B0 24841CB4 */ addiu $a0, %lo(D_80171CB4) # addiu $a0, $a0, 0x1cb4 -/* B55954 800DE7B4 00402825 */ move $a1, $v0 -/* B55958 800DE7B8 0C03790D */ jal func_800DE434 -/* B5595C 800DE7BC 8E060004 */ lw $a2, 4($s0) -/* B55960 800DE7C0 3C048017 */ lui $a0, %hi(D_80171B80) # $a0, 0x8017 -/* B55964 800DE7C4 24841B80 */ addiu $a0, %lo(D_80171B80) # addiu $a0, $a0, 0x1b80 -/* B55968 800DE7C8 0C0378F7 */ jal func_800DE3DC -/* B5596C 800DE7CC 8E050008 */ lw $a1, 8($s0) -/* B55970 800DE7D0 3C048017 */ lui $a0, %hi(D_80171DC4) # $a0, 0x8017 -/* B55974 800DE7D4 24841DC4 */ addiu $a0, %lo(D_80171DC4) # addiu $a0, $a0, 0x1dc4 -/* B55978 800DE7D8 00402825 */ move $a1, $v0 -/* B5597C 800DE7DC 0C03790D */ jal func_800DE434 -/* B55980 800DE7E0 8E060008 */ lw $a2, 8($s0) -/* B55984 800DE7E4 3C048017 */ lui $a0, %hi(D_80171BA0) # $a0, 0x8017 -/* B55988 800DE7E8 0C037917 */ jal func_800DE45C -/* B5598C 800DE7EC 24841BA0 */ addiu $a0, %lo(D_80171BA0) # addiu $a0, $a0, 0x1ba0 -/* B55990 800DE7F0 3C048017 */ lui $a0, %hi(D_80171CB0) # $a0, 0x8017 -/* B55994 800DE7F4 0C037917 */ jal func_800DE45C -/* B55998 800DE7F8 24841CB0 */ addiu $a0, %lo(D_80171CB0) # addiu $a0, $a0, 0x1cb0 -/* B5599C 800DE7FC 3C048017 */ lui $a0, %hi(D_80171DC0) # $a0, 0x8017 -/* B559A0 800DE800 0C037917 */ jal func_800DE45C -/* B559A4 800DE804 24841DC0 */ addiu $a0, %lo(D_80171DC0) # addiu $a0, $a0, 0x1dc0 -/* B559A8 800DE808 8FBF001C */ lw $ra, 0x1c($sp) -/* B559AC 800DE80C 8FB00018 */ lw $s0, 0x18($sp) -/* B559B0 800DE810 27BD0020 */ addiu $sp, $sp, 0x20 -/* B559B4 800DE814 03E00008 */ jr $ra -/* B559B8 800DE818 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_heap/func_800DE81C.s b/asm/non_matchings/code/audio_heap/func_800DE81C.s deleted file mode 100644 index 0abca51254..0000000000 --- a/asm/non_matchings/code/audio_heap/func_800DE81C.s +++ /dev/null @@ -1,51 +0,0 @@ -glabel func_800DE81C -/* B559BC 800DE81C 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 -/* B559C0 800DE820 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 -/* B559C4 800DE824 8C4E2A10 */ lw $t6, 0x2a10($v0) -/* B559C8 800DE828 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B559CC 800DE82C AFB00018 */ sw $s0, 0x18($sp) -/* B559D0 800DE830 00808025 */ move $s0, $a0 -/* B559D4 800DE834 AFBF001C */ sw $ra, 0x1c($sp) -/* B559D8 800DE838 3C048017 */ lui $a0, %hi(D_80171B90) # $a0, 0x8017 -/* B559DC 800DE83C AC4E2A14 */ sw $t6, 0x2a14($v0) -/* B559E0 800DE840 8E050000 */ lw $a1, ($s0) -/* B559E4 800DE844 0C0378F7 */ jal func_800DE3DC -/* B559E8 800DE848 24841B90 */ addiu $a0, %lo(D_80171B90) # addiu $a0, $a0, 0x1b90 -/* B559EC 800DE84C 3C048017 */ lui $a0, %hi(D_80171C78) # $a0, 0x8017 -/* B559F0 800DE850 24841C78 */ addiu $a0, %lo(D_80171C78) # addiu $a0, $a0, 0x1c78 -/* B559F4 800DE854 00402825 */ move $a1, $v0 -/* B559F8 800DE858 0C03790D */ jal func_800DE434 -/* B559FC 800DE85C 8E060000 */ lw $a2, ($s0) -/* B55A00 800DE860 3C048017 */ lui $a0, %hi(D_80171B90) # $a0, 0x8017 -/* B55A04 800DE864 24841B90 */ addiu $a0, %lo(D_80171B90) # addiu $a0, $a0, 0x1b90 -/* B55A08 800DE868 0C0378F7 */ jal func_800DE3DC -/* B55A0C 800DE86C 8E050004 */ lw $a1, 4($s0) -/* B55A10 800DE870 3C048017 */ lui $a0, %hi(D_80171D88) # $a0, 0x8017 -/* B55A14 800DE874 24841D88 */ addiu $a0, %lo(D_80171D88) # addiu $a0, $a0, 0x1d88 -/* B55A18 800DE878 00402825 */ move $a1, $v0 -/* B55A1C 800DE87C 0C03790D */ jal func_800DE434 -/* B55A20 800DE880 8E060004 */ lw $a2, 4($s0) -/* B55A24 800DE884 3C048017 */ lui $a0, %hi(D_80171B90) # $a0, 0x8017 -/* B55A28 800DE888 24841B90 */ addiu $a0, %lo(D_80171B90) # addiu $a0, $a0, 0x1b90 -/* B55A2C 800DE88C 0C0378F7 */ jal func_800DE3DC -/* B55A30 800DE890 8E050008 */ lw $a1, 8($s0) -/* B55A34 800DE894 3C048017 */ lui $a0, %hi(D_80171E98) # $a0, 0x8017 -/* B55A38 800DE898 24841E98 */ addiu $a0, %lo(D_80171E98) # addiu $a0, $a0, 0x1e98 -/* B55A3C 800DE89C 00402825 */ move $a1, $v0 -/* B55A40 800DE8A0 0C03790D */ jal func_800DE434 -/* B55A44 800DE8A4 8E060008 */ lw $a2, 8($s0) -/* B55A48 800DE8A8 3C048017 */ lui $a0, %hi(D_80171C74) # $a0, 0x8017 -/* B55A4C 800DE8AC 0C03791C */ jal func_800DE470 -/* B55A50 800DE8B0 24841C74 */ addiu $a0, %lo(D_80171C74) # addiu $a0, $a0, 0x1c74 -/* B55A54 800DE8B4 3C048017 */ lui $a0, %hi(D_80171D84) # $a0, 0x8017 -/* B55A58 800DE8B8 0C03791C */ jal func_800DE470 -/* B55A5C 800DE8BC 24841D84 */ addiu $a0, %lo(D_80171D84) # addiu $a0, $a0, 0x1d84 -/* B55A60 800DE8C0 3C048017 */ lui $a0, %hi(D_80171E94) # $a0, 0x8017 -/* B55A64 800DE8C4 0C03791C */ jal func_800DE470 -/* B55A68 800DE8C8 24841E94 */ addiu $a0, %lo(D_80171E94) # addiu $a0, $a0, 0x1e94 -/* B55A6C 800DE8CC 8FBF001C */ lw $ra, 0x1c($sp) -/* B55A70 800DE8D0 8FB00018 */ lw $s0, 0x18($sp) -/* B55A74 800DE8D4 27BD0020 */ addiu $sp, $sp, 0x20 -/* B55A78 800DE8D8 03E00008 */ jr $ra -/* B55A7C 800DE8DC 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_heap/func_800DF0CC.s b/asm/non_matchings/code/audio_heap/func_800DF0CC.s index 505ee2f77b..9f13048913 100644 --- a/asm/non_matchings/code/audio_heap/func_800DF0CC.s +++ b/asm/non_matchings/code/audio_heap/func_800DF0CC.s @@ -6,21 +6,21 @@ glabel func_800DF0CC /* B5627C 800DF0DC 00803825 */ move $a3, $a0 /* B56280 800DF0E0 24010001 */ li $at, 1 /* B56284 800DF0E4 10810009 */ beq $a0, $at, .L800DF10C -/* B56288 800DF0E8 3C058017 */ lui $a1, %hi(D_80171CB0) +/* B56288 800DF0E8 3C058017 */ lui $a1, %hi(gAudioContext+0x2b30) /* B5628C 800DF0EC 24010002 */ li $at, 2 /* B56290 800DF0F0 10810008 */ beq $a0, $at, .L800DF114 -/* B56294 800DF0F4 3C058017 */ lui $a1, %hi(D_80171DC0) +/* B56294 800DF0F4 3C058017 */ lui $a1, %hi(gAudioContext+0x2c40) /* B56298 800DF0F8 10000007 */ b .L800DF118 /* B5629C 800DF0FC 8FA50018 */ lw $a1, 0x18($sp) .L800DF100: -/* B562A0 800DF100 3C058017 */ lui $a1, %hi(D_80171BA0) # $a1, 0x8017 +/* B562A0 800DF100 3C058017 */ lui $a1, %hi(gAudioContext+0x2a20) # $a1, 0x8017 /* B562A4 800DF104 10000004 */ b .L800DF118 -/* B562A8 800DF108 24A51BA0 */ addiu $a1, %lo(D_80171BA0) # addiu $a1, $a1, 0x1ba0 +/* B562A8 800DF108 24A51BA0 */ addiu $a1, %lo(gAudioContext+0x2a20) # addiu $a1, $a1, 0x1ba0 .L800DF10C: /* B562AC 800DF10C 10000002 */ b .L800DF118 -/* B562B0 800DF110 24A51CB0 */ addiu $a1, %lo(D_80171CB0) +/* B562B0 800DF110 24A51CB0 */ addiu $a1, %lo(gAudioContext+0x2b30) .L800DF114: -/* B562B4 800DF114 24A51DC0 */ addiu $a1, %lo(D_80171DC0) +/* B562B4 800DF114 24A51DC0 */ addiu $a1, %lo(gAudioContext+0x2c40) .L800DF118: /* B562B8 800DF118 8FAE0024 */ lw $t6, 0x24($sp) /* B562BC 800DF11C 24A300D4 */ addiu $v1, $a1, 0xd4 diff --git a/asm/non_matchings/code/audio_heap/func_800DF7C4.s b/asm/non_matchings/code/audio_heap/func_800DF7C4.s index 8b65f64612..26ba9d328f 100644 --- a/asm/non_matchings/code/audio_heap/func_800DF7C4.s +++ b/asm/non_matchings/code/audio_heap/func_800DF7C4.s @@ -39,8 +39,8 @@ glabel func_800DF7C4 /* B569E8 800DF848 26100001 */ addiu $s0, $s0, 1 /* B569EC 800DF84C 1612FFFC */ bne $s0, $s2, .L800DF840 /* B569F0 800DF850 00000000 */ nop -/* B569F4 800DF854 3C028017 */ lui $v0, %hi(D_8016F181) # $v0, 0x8017 -/* B569F8 800DF858 8042F181 */ lb $v0, %lo(D_8016F181)($v0) +/* B569F4 800DF854 3C028017 */ lui $v0, %hi(gAudioContext+0x1) # $v0, 0x8017 +/* B569F8 800DF858 8042F181 */ lb $v0, %lo(gAudioContext+0x1)($v0) .L800DF85C: /* B569FC 800DF85C 26730001 */ addiu $s3, $s3, 1 /* B56A00 800DF860 0262082A */ slt $at, $s3, $v0 diff --git a/asm/non_matchings/code/audio_heap/func_800DF8F4.s b/asm/non_matchings/code/audio_heap/func_800DF8F4.s index e27f5cae1d..26b522f32b 100644 --- a/asm/non_matchings/code/audio_heap/func_800DF8F4.s +++ b/asm/non_matchings/code/audio_heap/func_800DF8F4.s @@ -39,11 +39,11 @@ glabel L800DF954 /* B56AF8 800DF958 00002825 */ move $a1, $zero /* B56AFC 800DF95C 5920000E */ blezl $t1, .L800DF998 /* B56B00 800DF960 8FAB0024 */ lw $t3, 0x24($sp) -/* B56B04 800DF964 3C108017 */ lui $s0, %hi(D_801726B0) # $s0, 0x8017 -/* B56B08 800DF968 261026B0 */ addiu $s0, %lo(D_801726B0) # addiu $s0, $s0, 0x26b0 +/* B56B04 800DF964 3C108017 */ lui $s0, %hi(gAudioContext+0x3530) # $s0, 0x8017 +/* B56B08 800DF968 261026B0 */ addiu $s0, %lo(gAudioContext+0x3530) # addiu $s0, $s0, 0x26b0 /* B56B0C 800DF96C 02002025 */ move $a0, $s0 .L800DF970: -/* B56B10 800DF970 0C03A6D1 */ jal func_800E9B44 +/* B56B10 800DF970 0C03A6D1 */ jal Audio_SequencePlayerDisableAsFinished /* B56B14 800DF974 AFA5002C */ sw $a1, 0x2c($sp) /* B56B18 800DF978 8FA5002C */ lw $a1, 0x2c($sp) /* B56B1C 800DF97C 862A285C */ lh $t2, 0x285c($s1) @@ -185,9 +185,9 @@ glabel L800DFB54 /* B56CF8 800DFB58 00000000 */ nop /* B56CFC 800DFB5C 3C0F8017 */ lui $t7, %hi(gAudioContext) /* B56D00 800DFB60 25E3F180 */ addiu $v1, $t7, %lo(gAudioContext) -/* B56D04 800DFB64 3C078017 */ lui $a3, %hi(D_8016F18C) # $a3, 0x8017 +/* B56D04 800DFB64 3C078017 */ lui $a3, %hi(gAudioContext+0xc) # $a3, 0x8017 /* B56D08 800DFB68 A2203518 */ sb $zero, 0x3518($s1) -/* B56D0C 800DFB6C 24E7F18C */ addiu $a3, %lo(D_8016F18C) # addiu $a3, $a3, -0xe74 +/* B56D0C 800DFB6C 24E7F18C */ addiu $a3, %lo(gAudioContext+0xc) # addiu $a3, $a3, -0xe74 /* B56D10 800DFB70 00603025 */ move $a2, $v1 /* B56D14 800DFB74 24040B00 */ li $a0, 2816 .L800DFB78: diff --git a/asm/non_matchings/code/audio_heap/func_800DFBF8.s b/asm/non_matchings/code/audio_heap/func_800DFBF8.s index de3d144be5..f6e1ab2a9e 100644 --- a/asm/non_matchings/code/audio_heap/func_800DFBF8.s +++ b/asm/non_matchings/code/audio_heap/func_800DFBF8.s @@ -95,8 +95,8 @@ glabel func_800DFBF8 /* B56EE8 800DFD48 24ABFFF8 */ addiu $t3, $a1, -8 /* B56EEC 800DFD4C A6CA2858 */ sh $t2, 0x2858($s6) /* B56EF0 800DFD50 A6CB285A */ sh $t3, 0x285a($s6) -/* B56EF4 800DFD54 3C048017 */ lui $a0, %hi(D_80172588) -/* B56EF8 800DFD58 24842588 */ addiu $a0, %lo(D_80172588) # addiu $a0, $a0, 0x2588 +/* B56EF4 800DFD54 3C048017 */ lui $a0, %hi(gAudioContext+0x3408) +/* B56EF8 800DFD58 24842588 */ addiu $a0, %lo(gAudioContext+0x3408) # addiu $a0, $a0, 0x2588 /* B56EFC 800DFD5C E6C8286C */ swc1 $f8, 0x286c($s6) /* B56F00 800DFD60 46009183 */ div.s $f6, $f18, $f0 /* B56F04 800DFD64 E6CA2860 */ swc1 $f10, 0x2860($s6) @@ -229,7 +229,7 @@ glabel func_800DFBF8 /* B570E8 800DFF48 01CD7023 */ subu $t6, $t6, $t5 /* B570EC 800DFF4C 000E70C0 */ sll $t6, $t6, 3 /* B570F0 800DFF50 8EC329A0 */ lw $v1, 0x29a0($s6) -/* B570F4 800DFF54 3C018017 */ lui $at, %hi(D_80172594) # $at, 0x8017 +/* B570F4 800DFF54 3C018017 */ lui $at, %hi(gAudioContext+0x3414) # $at, 0x8017 /* B570F8 800DFF58 00006012 */ mflo $t4 /* B570FC 800DFF5C 018E7821 */ addu $t7, $t4, $t6 /* B57100 800DFF60 25F80140 */ addiu $t8, $t7, 0x140 @@ -254,43 +254,43 @@ glabel func_800DFBF8 /* B5714C 800DFFAC AEC329A4 */ sw $v1, 0x29a4($s6) .L800DFFB0: /* B57150 800DFFB0 AEC53408 */ sw $a1, 0x3408($s6) -/* B57154 800DFFB4 0C037994 */ jal func_800DE650 -/* B57158 800DFFB8 AC222594 */ sw $v0, %lo(D_80172594)($at) -/* B5715C 800DFFBC 3C048017 */ lui $a0, %hi(D_80172598) # $a0, 0x8017 +/* B57154 800DFFB4 0C037994 */ jal Audio_SessionPoolsInit +/* B57158 800DFFB8 AC222594 */ sw $v0, %lo(gAudioContext+0x3414)($at) +/* B5715C 800DFFBC 3C048017 */ lui $a0, %hi(gAudioContext+0x3418) # $a0, 0x8017 /* B57160 800DFFC0 AED03418 */ sw $s0, 0x3418($s6) /* B57164 800DFFC4 AED1341C */ sw $s1, 0x341c($s6) -/* B57168 800DFFC8 0C0379B5 */ jal func_800DE6D4 -/* B5716C 800DFFCC 24842598 */ addiu $a0, %lo(D_80172598) # addiu $a0, $a0, 0x2598 +/* B57168 800DFFC8 0C0379B5 */ jal Audio_SeqAndBankPoolInit +/* B5716C 800DFFCC 24842598 */ addiu $a0, %lo(gAudioContext+0x3418) # addiu $a0, $a0, 0x2598 /* B57170 800DFFD0 8FA20068 */ lw $v0, 0x68($sp) -/* B57174 800DFFD4 3C048017 */ lui $a0, %hi(D_801725A0) # $a0, 0x8017 -/* B57178 800DFFD8 248425A0 */ addiu $a0, %lo(D_801725A0) # addiu $a0, $a0, 0x25a0 +/* B57174 800DFFD4 3C048017 */ lui $a0, %hi(gAudioContext+0x3420) # $a0, 0x8017 +/* B57178 800DFFD8 248425A0 */ addiu $a0, %lo(gAudioContext+0x3420) # addiu $a0, $a0, 0x25a0 /* B5717C 800DFFDC 8C4A0018 */ lw $t2, 0x18($v0) /* B57180 800DFFE0 AECA3420 */ sw $t2, 0x3420($s6) /* B57184 800DFFE4 8C4B001C */ lw $t3, 0x1c($v0) /* B57188 800DFFE8 AECB3424 */ sw $t3, 0x3424($s6) /* B5718C 800DFFEC 8C4D0020 */ lw $t5, 0x20($v0) -/* B57190 800DFFF0 0C0379D6 */ jal func_800DE758 +/* B57190 800DFFF0 0C0379D6 */ jal Audio_PersistentPoolsInit /* B57194 800DFFF4 AECD3428 */ sw $t5, 0x3428($s6) /* B57198 800DFFF8 8FA20068 */ lw $v0, 0x68($sp) -/* B5719C 800DFFFC 3C048017 */ lui $a0, %hi(D_801725AC) # $a0, 0x8017 -/* B571A0 800E0000 248425AC */ addiu $a0, %lo(D_801725AC) # addiu $a0, $a0, 0x25ac +/* B5719C 800DFFFC 3C048017 */ lui $a0, %hi(gAudioContext+0x342c) # $a0, 0x8017 +/* B571A0 800E0000 248425AC */ addiu $a0, %lo(gAudioContext+0x342c) # addiu $a0, $a0, 0x25ac /* B571A4 800E0004 8C4C0024 */ lw $t4, 0x24($v0) /* B571A8 800E0008 AECC342C */ sw $t4, 0x342c($s6) /* B571AC 800E000C 8C4E0028 */ lw $t6, 0x28($v0) /* B571B0 800E0010 AECE3430 */ sw $t6, 0x3430($s6) /* B571B4 800E0014 8C4F002C */ lw $t7, 0x2c($v0) -/* B571B8 800E0018 0C037A07 */ jal func_800DE81C +/* B571B8 800E0018 0C037A07 */ jal Audio_TemporaryPoolsInit /* B571BC 800E001C AECF3434 */ sw $t7, 0x3434($s6) /* B571C0 800E0020 0C0377E0 */ jal func_800DDF80 /* B571C4 800E0024 00000000 */ nop /* B571C8 800E0028 8EC52894 */ lw $a1, 0x2894($s6) -/* B571CC 800E002C 3C138017 */ lui $s3, %hi(D_80171B40) # $s3, 0x8017 -/* B571D0 800E0030 26731B40 */ addiu $s3, %lo(D_80171B40) # addiu $s3, $s3, 0x1b40 +/* B571CC 800E002C 3C138017 */ lui $s3, %hi(gAudioContext+0x29c0) # $s3, 0x8017 +/* B571D0 800E0030 26731B40 */ addiu $s3, %lo(gAudioContext+0x29c0) # addiu $s3, $s3, 0x1b40 /* B571D4 800E0034 00A00821 */ addu $at, $a1, $zero /* B571D8 800E0038 000528C0 */ sll $a1, $a1, 3 /* B571DC 800E003C 00A12823 */ subu $a1, $a1, $at /* B571E0 800E0040 00052940 */ sll $a1, $a1, 5 -/* B571E4 800E0044 0C0378E0 */ jal func_800DE380 +/* B571E4 800E0044 0C0378E0 */ jal Audio_AllocZeroed /* B571E8 800E0048 02602025 */ move $a0, $s3 /* B571EC 800E004C 0C03A1E2 */ jal Audio_NoteInitAll /* B571F0 800E0050 AEC2352C */ sw $v0, 0x352c($s6) @@ -302,12 +302,12 @@ glabel func_800DFBF8 /* B57208 800E0068 03190019 */ multu $t8, $t9 /* B5720C 800E006C 00002812 */ mflo $a1 /* B57210 800E0070 00052940 */ sll $a1, $a1, 5 -/* B57214 800E0074 0C0378E0 */ jal func_800DE380 +/* B57214 800E0074 0C0378E0 */ jal Audio_AllocZeroed /* B57218 800E0078 00000000 */ nop /* B5721C 800E007C 3C108017 */ lui $s0, %hi(gAudioContext) # $s0, 0x8017 -/* B57220 800E0080 3C118017 */ lui $s1, %hi(D_8016F188) # $s1, 0x8017 +/* B57220 800E0080 3C118017 */ lui $s1, %hi(gAudioContext+0x8) # $s1, 0x8017 /* B57224 800E0084 AEC20014 */ sw $v0, 0x14($s6) -/* B57228 800E0088 2631F188 */ addiu $s1, %lo(D_8016F188) # addiu $s1, $s1, -0xe78 +/* B57228 800E0088 2631F188 */ addiu $s1, %lo(gAudioContext+0x8) # addiu $s1, $s1, -0xe78 /* B5722C 800E008C 2610F180 */ addiu $s0, %lo(gAudioContext) # addiu $s0, $s0, -0xe80 .L800E0090: /* B57230 800E0090 8EC52890 */ lw $a1, 0x2890($s6) @@ -318,13 +318,13 @@ glabel func_800DFBF8 /* B57244 800E00A4 1611FFFA */ bne $s0, $s1, .L800E0090 /* B57248 800E00A8 AE0228A8 */ sw $v0, 0x28a8($s0) /* B5724C 800E00AC 02602025 */ move $a0, $s3 -/* B57250 800E00B0 0C0378F7 */ jal func_800DE3DC +/* B57250 800E00B0 0C0378F7 */ jal Audio_Alloc /* B57254 800E00B4 24050400 */ li $a1, 1024 /* B57258 800E00B8 0C03778F */ jal func_800DDE3C /* B5725C 800E00BC AEC23520 */ sw $v0, 0x3520($s6) /* B57260 800E00C0 3C148017 */ lui $s4, %hi(gAudioContext) # $s4, 0x8017 -/* B57264 800E00C4 3C028017 */ lui $v0, %hi(D_8016FCA0) # $v0, 0x8017 -/* B57268 800E00C8 2442FCA0 */ addiu $v0, %lo(D_8016FCA0) # addiu $v0, $v0, -0x360 +/* B57264 800E00C4 3C028017 */ lui $v0, %hi(gAudioContext+0xb20) # $v0, 0x8017 +/* B57268 800E00C8 2442FCA0 */ addiu $v0, %lo(gAudioContext+0xb20) # addiu $v0, $v0, -0x360 /* B5726C 800E00CC 2694F180 */ addiu $s4, %lo(gAudioContext) # addiu $s4, $s4, -0xe80 .L800E00D0: /* B57270 800E00D0 269402C8 */ addiu $s4, $s4, 0x2c8 @@ -337,13 +337,13 @@ glabel func_800DFBF8 /* B5728C 800E00EC A2CA0001 */ sb $t2, 1($s6) /* B57290 800E00F0 82CB0001 */ lb $t3, 1($s6) /* B57294 800E00F4 196000CA */ blez $t3, .L800E0420 -/* B57298 800E00F8 3C0D8017 */ lui $t5, %hi(D_8016F430) # $t5, 0x8017 -/* B5729C 800E00FC 25ADF430 */ addiu $t5, %lo(D_8016F430) # addiu $t5, $t5, -0xbd0 +/* B57298 800E00F8 3C0D8017 */ lui $t5, %hi(gAudioContext+0x2b0) # $t5, 0x8017 +/* B5729C 800E00FC 25ADF430 */ addiu $t5, %lo(gAudioContext+0x2b0) # addiu $t5, $t5, -0xbd0 /* B572A0 800E0100 3C148017 */ lui $s4, %hi(gAudioContext) # $s4, 0x8017 -/* B572A4 800E0104 3C128017 */ lui $s2, %hi(D_8016F198) # $s2, 0x8017 -/* B572A8 800E0108 3C1E8017 */ lui $fp, %hi(D_8016F420) # $fp, 0x8017 -/* B572AC 800E010C 27DEF420 */ addiu $fp, %lo(D_8016F420) # addiu $fp, $fp, -0xbe0 -/* B572B0 800E0110 2652F198 */ addiu $s2, %lo(D_8016F198) # addiu $s2, $s2, -0xe68 +/* B572A4 800E0104 3C128017 */ lui $s2, %hi(gAudioContext+0x18) # $s2, 0x8017 +/* B572A8 800E0108 3C1E8017 */ lui $fp, %hi(gAudioContext+0x2a0) # $fp, 0x8017 +/* B572AC 800E010C 27DEF420 */ addiu $fp, %lo(gAudioContext+0x2a0) # addiu $fp, $fp, -0xbe0 +/* B572B0 800E0110 2652F198 */ addiu $s2, %lo(gAudioContext+0x18) # addiu $s2, $s2, -0xe68 /* B572B4 800E0114 2694F180 */ addiu $s4, %lo(gAudioContext) # addiu $s4, $s4, -0xe80 /* B572B8 800E0118 AFAD0044 */ sw $t5, 0x44($sp) /* B572BC 800E011C 0000B825 */ move $s7, $zero @@ -460,19 +460,19 @@ glabel func_800DFBF8 .L800E02C8: /* B57468 800E02C8 02602025 */ move $a0, $s3 /* B5746C 800E02CC 24050020 */ li $a1, 32 -/* B57470 800E02D0 0C0378E0 */ jal func_800DE380 +/* B57470 800E02D0 0C0378E0 */ jal Audio_AllocZeroed /* B57474 800E02D4 00008825 */ move $s1, $zero /* B57478 800E02D8 AE420030 */ sw $v0, 0x30($s2) /* B5747C 800E02DC 02602025 */ move $a0, $s3 -/* B57480 800E02E0 0C0378E0 */ jal func_800DE380 +/* B57480 800E02E0 0C0378E0 */ jal Audio_AllocZeroed /* B57484 800E02E4 24050020 */ li $a1, 32 /* B57488 800E02E8 AE420034 */ sw $v0, 0x34($s2) /* B5748C 800E02EC 02602025 */ move $a0, $s3 -/* B57490 800E02F0 0C0378E0 */ jal func_800DE380 +/* B57490 800E02F0 0C0378E0 */ jal Audio_AllocZeroed /* B57494 800E02F4 24050020 */ li $a1, 32 /* B57498 800E02F8 AE420038 */ sw $v0, 0x38($s2) /* B5749C 800E02FC 02602025 */ move $a0, $s3 -/* B574A0 800E0300 0C0378E0 */ jal func_800DE380 +/* B574A0 800E0300 0C0378E0 */ jal Audio_AllocZeroed /* B574A4 800E0304 24050020 */ li $a1, 32 /* B574A8 800E0308 AE42003C */ sw $v0, 0x3c($s2) /* B574AC 800E030C 86D82854 */ lh $t8, 0x2854($s6) @@ -508,7 +508,7 @@ glabel func_800DFBF8 /* B57518 800E0378 24050040 */ li $a1, 64 /* B5751C 800E037C AE420278 */ sw $v0, 0x278($s2) /* B57520 800E0380 02602025 */ move $a0, $s3 -/* B57524 800E0384 0C0378C2 */ jal Audio_SoundAlloc +/* B57524 800E0384 0C0378C2 */ jal Audio_AllocDmaMemory /* B57528 800E0388 24050010 */ li $a1, 16 /* B5752C 800E038C AE420270 */ sw $v0, 0x270($s2) /* B57530 800E0390 86A50014 */ lh $a1, 0x14($s5) @@ -527,7 +527,7 @@ glabel func_800DFBF8 /* B5755C 800E03BC 24050040 */ li $a1, 64 /* B57560 800E03C0 AE42027C */ sw $v0, 0x27c($s2) /* B57564 800E03C4 02602025 */ move $a0, $s3 -/* B57568 800E03C8 0C0378C2 */ jal Audio_SoundAlloc +/* B57568 800E03C8 0C0378C2 */ jal Audio_AllocDmaMemory /* B5756C 800E03CC 24050010 */ li $a1, 16 /* B57570 800E03D0 AE420274 */ sw $v0, 0x274($s2) /* B57574 800E03D4 86A50016 */ lh $a1, 0x16($s5) @@ -552,17 +552,17 @@ glabel func_800DFBF8 /* B575B8 800E0418 1420FF41 */ bnez $at, .L800E0120 /* B575BC 800E041C 27DE02C8 */ addiu $fp, $fp, 0x2c8 .L800E0420: -/* B575C0 800E0420 0C03B237 */ jal func_800EC8DC +/* B575C0 800E0420 0C03B237 */ jal Audio_InitSequencePlayers /* B575C4 800E0424 00008825 */ move $s1, $zero /* B575C8 800E0428 86D9285C */ lh $t9, 0x285c($s6) -/* B575CC 800E042C 3C108017 */ lui $s0, %hi(D_801726B0) # $s0, 0x8017 -/* B575D0 800E0430 261026B0 */ addiu $s0, %lo(D_801726B0) # addiu $s0, $s0, 0x26b0 +/* B575CC 800E042C 3C108017 */ lui $s0, %hi(gAudioContext+0x3530) # $s0, 0x8017 +/* B575D0 800E0430 261026B0 */ addiu $s0, %lo(gAudioContext+0x3530) # addiu $s0, $s0, 0x26b0 /* B575D4 800E0434 5B20000C */ blezl $t9, .L800E0468 /* B575D8 800E0438 8FAB0068 */ lw $t3, 0x68($sp) .L800E043C: /* B575DC 800E043C 0C03B1CD */ jal func_800EC734 /* B575E0 800E0440 02202025 */ move $a0, $s1 -/* B575E4 800E0444 0C03B19A */ jal func_800EC668 +/* B575E4 800E0444 0C03B19A */ jal Audio_ResetSequencePlayer /* B575E8 800E0448 02002025 */ move $a0, $s0 /* B575EC 800E044C 86CA285C */ lh $t2, 0x285c($s6) /* B575F0 800E0450 26310001 */ addiu $s1, $s1, 1 diff --git a/asm/non_matchings/code/audio_heap/func_800E04E8.s b/asm/non_matchings/code/audio_heap/func_800E04E8.s index e5ba83f21a..43e77f8210 100644 --- a/asm/non_matchings/code/audio_heap/func_800E04E8.s +++ b/asm/non_matchings/code/audio_heap/func_800E04E8.s @@ -1,6 +1,6 @@ glabel func_800E04E8 -/* B57688 800E04E8 3C038017 */ lui $v1, %hi(D_80171EDC) # $v1, 0x8017 -/* B5768C 800E04EC 8C631EDC */ lw $v1, %lo(D_80171EDC)($v1) +/* B57688 800E04E8 3C038017 */ lui $v1, %hi(gAudioContext+0x2d5c) # $v1, 0x8017 +/* B5768C 800E04EC 8C631EDC */ lw $v1, %lo(gAudioContext+0x2d5c)($v1) /* B57690 800E04F0 00A03025 */ move $a2, $a1 /* B57694 800E04F4 3C058017 */ lui $a1, %hi(gAudioContext) # $a1, 0x8017 /* B57698 800E04F8 1860000E */ blez $v1, .L800E0534 diff --git a/asm/non_matchings/code/audio_heap/func_800E0540.s b/asm/non_matchings/code/audio_heap/func_800E0540.s index 87e178919f..ce08fcba94 100644 --- a/asm/non_matchings/code/audio_heap/func_800E0540.s +++ b/asm/non_matchings/code/audio_heap/func_800E0540.s @@ -1,15 +1,15 @@ glabel func_800E0540 /* B576E0 800E0540 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B576E4 800E0544 3C0E8017 */ lui $t6, %hi(D_80171EDC) # $t6, 0x8017 -/* B576E8 800E0548 8DCE1EDC */ lw $t6, %lo(D_80171EDC)($t6) +/* B576E4 800E0544 3C0E8017 */ lui $t6, %hi(gAudioContext+0x2d5c) # $t6, 0x8017 +/* B576E8 800E0548 8DCE1EDC */ lw $t6, %lo(gAudioContext+0x2d5c)($t6) /* B576EC 800E054C AFA40020 */ sw $a0, 0x20($sp) /* B576F0 800E0550 AFBF0014 */ sw $ra, 0x14($sp) /* B576F4 800E0554 AFA50024 */ sw $a1, 0x24($sp) -/* B576F8 800E0558 3C048017 */ lui $a0, %hi(D_80171ED0) # $a0, 0x8017 +/* B576F8 800E0558 3C048017 */ lui $a0, %hi(gAudioContext+0x2d50) # $a0, 0x8017 /* B576FC 800E055C AFA60028 */ sw $a2, 0x28($sp) -/* B57700 800E0560 24841ED0 */ addiu $a0, %lo(D_80171ED0) # addiu $a0, $a0, 0x1ed0 +/* B57700 800E0560 24841ED0 */ addiu $a0, %lo(gAudioContext+0x2d50) # addiu $a0, $a0, 0x1ed0 /* B57704 800E0564 00C02825 */ move $a1, $a2 -/* B57708 800E0568 0C0378F7 */ jal func_800DE3DC +/* B57708 800E0568 0C0378F7 */ jal Audio_Alloc /* B5770C 800E056C AFAE0018 */ sw $t6, 0x18($sp) /* B57710 800E0570 8FAF0018 */ lw $t7, 0x18($sp) /* B57714 800E0574 3C198017 */ lui $t9, %hi(gAudioContext) # $t9, 0x8017 diff --git a/asm/non_matchings/code/audio_heap/func_800E0634.s b/asm/non_matchings/code/audio_heap/func_800E0634.s index 096d5b1abf..060ca424f1 100644 --- a/asm/non_matchings/code/audio_heap/func_800E0634.s +++ b/asm/non_matchings/code/audio_heap/func_800E0634.s @@ -3,23 +3,23 @@ glabel func_800E0634 /* B577D8 800E0638 AFA40018 */ sw $a0, 0x18($sp) /* B577DC 800E063C AFBF0014 */ sw $ra, 0x14($sp) /* B577E0 800E0640 AFA5001C */ sw $a1, 0x1c($sp) -/* B577E4 800E0644 3C048017 */ lui $a0, %hi(D_80171B40) # $a0, 0x8017 -/* B577E8 800E0648 24841B40 */ addiu $a0, %lo(D_80171B40) # addiu $a0, $a0, 0x1b40 +/* B577E4 800E0644 3C048017 */ lui $a0, %hi(gAudioContext+0x29c0) # $a0, 0x8017 +/* B577E8 800E0648 24841B40 */ addiu $a0, %lo(gAudioContext+0x29c0) # addiu $a0, $a0, 0x1b40 /* B577EC 800E064C 0C0378AC */ jal func_800DE2B0 /* B577F0 800E0650 8FA50018 */ lw $a1, 0x18($sp) /* B577F4 800E0654 14400004 */ bnez $v0, .L800E0668 /* B577F8 800E0658 00402825 */ move $a1, $v0 -/* B577FC 800E065C 3C018017 */ lui $at, %hi(D_80172068) # $at, 0x8017 +/* B577FC 800E065C 3C018017 */ lui $at, %hi(gAudioContext+0x2ee8) # $at, 0x8017 /* B57800 800E0660 10000005 */ b .L800E0678 -/* B57804 800E0664 AC202068 */ sw $zero, %lo(D_80172068)($at) +/* B57804 800E0664 AC202068 */ sw $zero, %lo(gAudioContext+0x2ee8)($at) .L800E0668: -/* B57808 800E0668 3C048017 */ lui $a0, %hi(D_80172060) # $a0, 0x8017 -/* B5780C 800E066C 24842060 */ addiu $a0, %lo(D_80172060) # addiu $a0, $a0, 0x2060 -/* B57810 800E0670 0C03790D */ jal func_800DE434 +/* B57808 800E0668 3C048017 */ lui $a0, %hi(gAudioContext+0x2ee0) # $a0, 0x8017 +/* B5780C 800E066C 24842060 */ addiu $a0, %lo(gAudioContext+0x2ee0) # addiu $a0, $a0, 0x2060 +/* B57810 800E0670 0C03790D */ jal Audio_SoundAllocPoolInit /* B57814 800E0674 8FA60018 */ lw $a2, 0x18($sp) .L800E0678: -/* B57818 800E0678 3C048017 */ lui $a0, %hi(D_80171B40) # $a0, 0x8017 -/* B5781C 800E067C 24841B40 */ addiu $a0, %lo(D_80171B40) # addiu $a0, $a0, 0x1b40 +/* B57818 800E0678 3C048017 */ lui $a0, %hi(gAudioContext+0x29c0) # $a0, 0x8017 +/* B5781C 800E067C 24841B40 */ addiu $a0, %lo(gAudioContext+0x29c0) # addiu $a0, $a0, 0x1b40 /* B57820 800E0680 0C0378AC */ jal func_800DE2B0 /* B57824 800E0684 8FA5001C */ lw $a1, 0x1c($sp) /* B57828 800E0688 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 @@ -29,9 +29,9 @@ glabel func_800E0634 /* B57838 800E0698 10000007 */ b .L800E06B8 /* B5783C 800E069C AC60317C */ sw $zero, 0x317c($v1) .L800E06A0: -/* B57840 800E06A0 3C048017 */ lui $a0, %hi(D_801722F4) # $a0, 0x8017 -/* B57844 800E06A4 248422F4 */ addiu $a0, %lo(D_801722F4) # addiu $a0, $a0, 0x22f4 -/* B57848 800E06A8 0C03790D */ jal func_800DE434 +/* B57840 800E06A0 3C048017 */ lui $a0, %hi(gAudioContext+0x3174) # $a0, 0x8017 +/* B57844 800E06A4 248422F4 */ addiu $a0, %lo(gAudioContext+0x3174) # addiu $a0, $a0, 0x22f4 +/* B57848 800E06A8 0C03790D */ jal Audio_SoundAllocPoolInit /* B5784C 800E06AC 8FA6001C */ lw $a2, 0x1c($sp) /* B57850 800E06B0 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 /* B57854 800E06B4 2463F180 */ addiu $v1, %lo(gAudioContext) # addiu $v1, $v1, -0xe80 diff --git a/asm/non_matchings/code/audio_heap/func_800E06CC.s b/asm/non_matchings/code/audio_heap/func_800E06CC.s index 63c9280ac3..ccd5ebd986 100644 --- a/asm/non_matchings/code/audio_heap/func_800E06CC.s +++ b/asm/non_matchings/code/audio_heap/func_800E06CC.s @@ -2,10 +2,10 @@ glabel func_800E06CC /* B5786C 800E06CC 27BDFFB8 */ addiu $sp, $sp, -0x48 /* B57870 800E06D0 AFB6002C */ sw $s6, 0x2c($sp) /* B57874 800E06D4 AFA40048 */ sw $a0, 0x48($sp) -/* B57878 800E06D8 3C048017 */ lui $a0, %hi(D_801722F4) # $a0, 0x8017 +/* B57878 800E06D8 3C048017 */ lui $a0, %hi(gAudioContext+0x3174) # $a0, 0x8017 /* B5787C 800E06DC 3C168017 */ lui $s6, %hi(gAudioContext) # $s6, 0x8017 /* B57880 800E06E0 26D6F180 */ addiu $s6, %lo(gAudioContext) # addiu $s6, $s6, -0xe80 -/* B57884 800E06E4 248422F4 */ addiu $a0, %lo(D_801722F4) # addiu $a0, $a0, 0x22f4 +/* B57884 800E06E4 248422F4 */ addiu $a0, %lo(gAudioContext+0x3174) # addiu $a0, $a0, 0x22f4 /* B57888 800E06E8 AFBF0034 */ sw $ra, 0x34($sp) /* B5788C 800E06EC AFB40024 */ sw $s4, 0x24($sp) /* B57890 800E06F0 AFB30020 */ sw $s3, 0x20($sp) @@ -16,33 +16,33 @@ glabel func_800E06CC /* B578A4 800E0704 AFB00014 */ sw $s0, 0x14($sp) /* B578A8 800E0708 0080A025 */ move $s4, $a0 /* B578AC 800E070C 8ED33178 */ lw $s3, 0x3178($s6) -/* B578B0 800E0710 0C0378F7 */ jal func_800DE3DC +/* B578B0 800E0710 0C0378F7 */ jal Audio_Alloc /* B578B4 800E0714 8FA50048 */ lw $a1, 0x48($sp) /* B578B8 800E0718 14400013 */ bnez $v0, .L800E0768 /* B578BC 800E071C AFA2003C */ sw $v0, 0x3c($sp) -/* B578C0 800E0720 3C0E8017 */ lui $t6, %hi(D_801722F4) # $t6, 0x8017 -/* B578C4 800E0724 8DCE22F4 */ lw $t6, %lo(D_801722F4)($t6) -/* B578C8 800E0728 3C108017 */ lui $s0, %hi(D_801722F8) # $s0, 0x8017 -/* B578CC 800E072C 8E1022F8 */ lw $s0, %lo(D_801722F8)($s0) -/* B578D0 800E0730 3C018017 */ lui $at, %hi(D_801722F8) # $at, 0x8017 -/* B578D4 800E0734 3C048017 */ lui $a0, %hi(D_801722F4) # $a0, 0x8017 -/* B578D8 800E0738 248422F4 */ addiu $a0, %lo(D_801722F4) # addiu $a0, $a0, 0x22f4 +/* B578C0 800E0720 3C0E8017 */ lui $t6, %hi(gAudioContext+0x3174) # $t6, 0x8017 +/* B578C4 800E0724 8DCE22F4 */ lw $t6, %lo(gAudioContext+0x3174)($t6) +/* B578C8 800E0728 3C108017 */ lui $s0, %hi(gAudioContext+0x3178) # $s0, 0x8017 +/* B578CC 800E072C 8E1022F8 */ lw $s0, %lo(gAudioContext+0x3178)($s0) +/* B578D0 800E0730 3C018017 */ lui $at, %hi(gAudioContext+0x3178) # $at, 0x8017 +/* B578D4 800E0734 3C048017 */ lui $a0, %hi(gAudioContext+0x3174) # $a0, 0x8017 +/* B578D8 800E0738 248422F4 */ addiu $a0, %lo(gAudioContext+0x3174) # addiu $a0, $a0, 0x22f4 /* B578DC 800E073C 8FA50048 */ lw $a1, 0x48($sp) -/* B578E0 800E0740 0C0378F7 */ jal func_800DE3DC -/* B578E4 800E0744 AC2E22F8 */ sw $t6, %lo(D_801722F8)($at) +/* B578E0 800E0740 0C0378F7 */ jal Audio_Alloc +/* B578E4 800E0744 AC2E22F8 */ sw $t6, %lo(gAudioContext+0x3178)($at) /* B578E8 800E0748 14400005 */ bnez $v0, .L800E0760 /* B578EC 800E074C AFA2003C */ sw $v0, 0x3c($sp) -/* B578F0 800E0750 3C018017 */ lui $at, %hi(D_801722F8) # $at, 0x8017 -/* B578F4 800E0754 AC3022F8 */ sw $s0, %lo(D_801722F8)($at) +/* B578F0 800E0750 3C018017 */ lui $at, %hi(gAudioContext+0x3178) # $at, 0x8017 +/* B578F4 800E0754 AC3022F8 */ sw $s0, %lo(gAudioContext+0x3178)($at) /* B578F8 800E0758 10000077 */ b .L800E0938 /* B578FC 800E075C 00001025 */ move $v0, $zero .L800E0760: -/* B57900 800E0760 3C138017 */ lui $s3, %hi(D_801722F4) # $s3, 0x8017 -/* B57904 800E0764 8E7322F4 */ lw $s3, %lo(D_801722F4)($s3) +/* B57900 800E0760 3C138017 */ lui $s3, %hi(gAudioContext+0x3174) # $s3, 0x8017 +/* B57904 800E0764 8E7322F4 */ lw $s3, %lo(gAudioContext+0x3174)($s3) .L800E0768: /* B57908 800E0768 8EC7176C */ lw $a3, 0x176c($s6) -/* B5790C 800E076C 3C128017 */ lui $s2, %hi(D_801722F8) # $s2, 0x8017 -/* B57910 800E0770 8E5222F8 */ lw $s2, %lo(D_801722F8)($s2) +/* B5790C 800E076C 3C128017 */ lui $s2, %hi(gAudioContext+0x3178) # $s2, 0x8017 +/* B57910 800E0770 8E5222F8 */ lw $s2, %lo(gAudioContext+0x3178)($s2) /* B57914 800E0774 2415FFFF */ li $s5, -1 /* B57918 800E0778 18E00034 */ blez $a3, .L800E084C /* B5791C 800E077C 00008825 */ move $s1, $zero @@ -89,8 +89,8 @@ glabel func_800E06CC /* B579B8 800E0818 016C1021 */ addu $v0, $t3, $t4 .L800E081C: /* B579BC 800E081C AC970010 */ sw $s7, 0x10($a0) -/* B579C0 800E0820 3C078017 */ lui $a3, %hi(D_801708EC) # $a3, 0x8017 -/* B579C4 800E0824 8CE708EC */ lw $a3, %lo(D_801708EC)($a3) +/* B579C0 800E0820 3C078017 */ lui $a3, %hi(gAudioContext+0x176c) # $a3, 0x8017 +/* B579C4 800E0824 8CE708EC */ lw $a3, %lo(gAudioContext+0x176c)($a3) .L800E0828: /* B579C8 800E0828 00076880 */ sll $t5, $a3, 2 /* B579CC 800E082C 01A76821 */ addu $t5, $t5, $a3 @@ -103,12 +103,12 @@ glabel func_800E06CC /* B579E4 800E0844 8CCF0D78 */ lw $t7, 0xd78($a2) /* B579E8 800E0848 00008825 */ move $s1, $zero .L800E084C: -/* B579EC 800E084C 3C0F8017 */ lui $t7, %hi(D_80172584) # $t7, 0x8017 -/* B579F0 800E0850 8DEF2584 */ lw $t7, %lo(D_80172584)($t7) -/* B579F4 800E0854 3C108017 */ lui $s0, %hi(D_801722F4) # $s0, 0x8017 +/* B579EC 800E084C 3C0F8017 */ lui $t7, %hi(gAudioContext+0x3404) # $t7, 0x8017 +/* B579F0 800E0850 8DEF2584 */ lw $t7, %lo(gAudioContext+0x3404)($t7) +/* B579F4 800E0854 3C108017 */ lui $s0, %hi(gAudioContext+0x3174) # $s0, 0x8017 /* B579F8 800E0858 24170001 */ li $s7, 1 /* B579FC 800E085C 19E00023 */ blez $t7, .L800E08EC -/* B57A00 800E0860 261022F4 */ addiu $s0, %lo(D_801722F4) # addiu $s0, $s0, 0x22f4 +/* B57A00 800E0860 261022F4 */ addiu $s0, %lo(gAudioContext+0x3174) # addiu $s0, $s0, 0x22f4 /* B57A04 800E0864 2416FFFF */ li $s6, -1 .L800E0868: /* B57A08 800E0868 82180010 */ lb $t8, 0x10($s0) @@ -152,17 +152,17 @@ glabel func_800E06CC .L800E08EC: /* B57A8C 800E08EC 2416FFFF */ li $s6, -1 /* B57A90 800E08F0 16B60006 */ bne $s5, $s6, .L800E090C -/* B57A94 800E08F4 3C0B8017 */ lui $t3, %hi(D_801722F4) # $t3, 0x8017 -/* B57A98 800E08F8 3C088017 */ lui $t0, %hi(D_80172584) # $t0, 0x8017 -/* B57A9C 800E08FC 8D152584 */ lw $s5, %lo(D_80172584)($t0) -/* B57AA0 800E0900 3C018017 */ lui $at, %hi(D_80172584) # $at, 0x8017 +/* B57A94 800E08F4 3C0B8017 */ lui $t3, %hi(gAudioContext+0x3174) # $t3, 0x8017 +/* B57A98 800E08F8 3C088017 */ lui $t0, %hi(gAudioContext+0x3404) # $t0, 0x8017 +/* B57A9C 800E08FC 8D152584 */ lw $s5, %lo(gAudioContext+0x3404)($t0) +/* B57AA0 800E0900 3C018017 */ lui $at, %hi(gAudioContext+0x3404) # $at, 0x8017 /* B57AA4 800E0904 26A90001 */ addiu $t1, $s5, 1 -/* B57AA8 800E0908 AC292584 */ sw $t1, %lo(D_80172584)($at) +/* B57AA8 800E0908 AC292584 */ sw $t1, %lo(gAudioContext+0x3404)($at) .L800E090C: /* B57AAC 800E090C 00155080 */ sll $t2, $s5, 2 /* B57AB0 800E0910 01555021 */ addu $t2, $t2, $s5 /* B57AB4 800E0914 000A5080 */ sll $t2, $t2, 2 -/* B57AB8 800E0918 256B22F4 */ addiu $t3, %lo(D_801722F4) # addiu $t3, $t3, 0x22f4 +/* B57AB8 800E0918 256B22F4 */ addiu $t3, %lo(gAudioContext+0x3174) # addiu $t3, $t3, 0x22f4 /* B57ABC 800E091C 014B1821 */ addu $v1, $t2, $t3 /* B57AC0 800E0920 8FAC003C */ lw $t4, 0x3c($sp) /* B57AC4 800E0924 8FAD0048 */ lw $t5, 0x48($sp) diff --git a/asm/non_matchings/code/audio_heap/func_800E0AD8.s b/asm/non_matchings/code/audio_heap/func_800E0AD8.s index a76c2b6c00..de4abced89 100644 --- a/asm/non_matchings/code/audio_heap/func_800E0AD8.s +++ b/asm/non_matchings/code/audio_heap/func_800E0AD8.s @@ -40,7 +40,7 @@ glabel func_800E0AD8 /* B57D00 800E0B60 02003025 */ move $a2, $s0 /* B57D04 800E0B64 50400008 */ beql $v0, $zero, .L800E0B88 /* B57D08 800E0B68 26100001 */ addiu $s0, $s0, 1 -/* B57D0C 800E0B6C 0C03862C */ jal func_800E18B0 +/* B57D0C 800E0B6C 0C03862C */ jal Audio_IsBankLoadComplete /* B57D10 800E0B70 02002025 */ move $a0, $s0 /* B57D14 800E0B74 10400003 */ beqz $v0, .L800E0B84 /* B57D18 800E0B78 02402025 */ move $a0, $s2 diff --git a/asm/non_matchings/code/audio_heap/func_800E0BF8.s b/asm/non_matchings/code/audio_heap/func_800E0BF8.s index 3fcc842226..3fe03293ee 100644 --- a/asm/non_matchings/code/audio_heap/func_800E0BF8.s +++ b/asm/non_matchings/code/audio_heap/func_800E0BF8.s @@ -2,19 +2,19 @@ glabel func_800E0BF8 /* B57D98 800E0BF8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B57D9C 800E0BFC AFA40018 */ sw $a0, 0x18($sp) /* B57DA0 800E0C00 AFBF0014 */ sw $ra, 0x14($sp) -/* B57DA4 800E0C04 3C048017 */ lui $a0, %hi(D_80172060) # $a0, 0x8017 -/* B57DA8 800E0C08 24842060 */ addiu $a0, %lo(D_80172060) # addiu $a0, $a0, 0x2060 -/* B57DAC 800E0C0C 0C0378F7 */ jal func_800DE3DC +/* B57DA4 800E0C04 3C048017 */ lui $a0, %hi(gAudioContext+0x2ee0) # $a0, 0x8017 +/* B57DA8 800E0C08 24842060 */ addiu $a0, %lo(gAudioContext+0x2ee0) # addiu $a0, $a0, 0x2060 +/* B57DAC 800E0C0C 0C0378F7 */ jal Audio_Alloc /* B57DB0 800E0C10 8FA50018 */ lw $a1, 0x18($sp) /* B57DB4 800E0C14 14400003 */ bnez $v0, .L800E0C24 /* B57DB8 800E0C18 00402025 */ move $a0, $v0 /* B57DBC 800E0C1C 10000014 */ b .L800E0C70 /* B57DC0 800E0C20 00001025 */ move $v0, $zero .L800E0C24: -/* B57DC4 800E0C24 3C0E8017 */ lui $t6, %hi(D_801722F0) # $t6, 0x8017 -/* B57DC8 800E0C28 8DCE22F0 */ lw $t6, %lo(D_801722F0)($t6) -/* B57DCC 800E0C2C 3C198017 */ lui $t9, %hi(D_80172060) # $t9, 0x8017 -/* B57DD0 800E0C30 27392060 */ addiu $t9, %lo(D_80172060) # addiu $t9, $t9, 0x2060 +/* B57DC4 800E0C24 3C0E8017 */ lui $t6, %hi(gAudioContext+0x3170) # $t6, 0x8017 +/* B57DC8 800E0C28 8DCE22F0 */ lw $t6, %lo(gAudioContext+0x3170)($t6) +/* B57DCC 800E0C2C 3C198017 */ lui $t9, %hi(gAudioContext+0x2ee0) # $t9, 0x8017 +/* B57DD0 800E0C30 27392060 */ addiu $t9, %lo(gAudioContext+0x2ee0) # addiu $t9, $t9, 0x2060 /* B57DD4 800E0C34 000E7880 */ sll $t7, $t6, 2 /* B57DD8 800E0C38 01EE7821 */ addu $t7, $t7, $t6 /* B57DDC 800E0C3C 000F7880 */ sll $t7, $t7, 2 @@ -24,12 +24,12 @@ glabel func_800E0BF8 /* B57DEC 800E0C4C A0480000 */ sb $t0, ($v0) /* B57DF0 800E0C50 AC440008 */ sw $a0, 8($v0) /* B57DF4 800E0C54 8FA90018 */ lw $t1, 0x18($sp) -/* B57DF8 800E0C58 3C0A8017 */ lui $t2, %hi(D_801722F0) # $t2, 0x8017 -/* B57DFC 800E0C5C 3C018017 */ lui $at, %hi(D_801722F0) # $at, 0x8017 +/* B57DF8 800E0C58 3C0A8017 */ lui $t2, %hi(gAudioContext+0x3170) # $t2, 0x8017 +/* B57DFC 800E0C5C 3C018017 */ lui $at, %hi(gAudioContext+0x3170) # $at, 0x8017 /* B57E00 800E0C60 AC490010 */ sw $t1, 0x10($v0) -/* B57E04 800E0C64 8D4A22F0 */ lw $t2, %lo(D_801722F0)($t2) +/* B57E04 800E0C64 8D4A22F0 */ lw $t2, %lo(gAudioContext+0x3170)($t2) /* B57E08 800E0C68 254B0001 */ addiu $t3, $t2, 1 -/* B57E0C 800E0C6C AC2B22F0 */ sw $t3, %lo(D_801722F0)($at) +/* B57E0C 800E0C6C AC2B22F0 */ sw $t3, %lo(gAudioContext+0x3170)($at) .L800E0C70: /* B57E10 800E0C70 8FBF0014 */ lw $ra, 0x14($sp) /* B57E14 800E0C74 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/asm/non_matchings/code/audio_heap/func_800E0CBC.s b/asm/non_matchings/code/audio_heap/func_800E0CBC.s index f93a742fd0..9905371771 100644 --- a/asm/non_matchings/code/audio_heap/func_800E0CBC.s +++ b/asm/non_matchings/code/audio_heap/func_800E0CBC.s @@ -34,13 +34,13 @@ glabel func_800E0CBC /* B57ED4 800E0D34 02803025 */ move $a2, $s4 /* B57ED8 800E0D38 50400026 */ beql $v0, $zero, .L800E0DD4 /* B57EDC 800E0D3C 26940001 */ addiu $s4, $s4, 1 -/* B57EE0 800E0D40 0C03862C */ jal func_800E18B0 +/* B57EE0 800E0D40 0C03862C */ jal Audio_IsBankLoadComplete /* B57EE4 800E0D44 02802025 */ move $a0, $s4 /* B57EE8 800E0D48 50400022 */ beql $v0, $zero, .L800E0DD4 /* B57EEC 800E0D4C 26940001 */ addiu $s4, $s4, 1 /* B57EF0 800E0D50 8EB83170 */ lw $t8, 0x3170($s5) -/* B57EF4 800E0D54 3C118017 */ lui $s1, %hi(D_80172070) # $s1, 0x8017 -/* B57EF8 800E0D58 26312070 */ addiu $s1, %lo(D_80172070) # addiu $s1, $s1, 0x2070 +/* B57EF4 800E0D54 3C118017 */ lui $s1, %hi(gAudioContext+0x2ef0) # $s1, 0x8017 +/* B57EF8 800E0D58 26312070 */ addiu $s1, %lo(gAudioContext+0x2ef0) # addiu $s1, $s1, 0x2070 /* B57EFC 800E0D5C 1B00000D */ blez $t8, .L800E0D94 /* B57F00 800E0D60 00008025 */ move $s0, $zero /* B57F04 800E0D64 02202025 */ move $a0, $s1 @@ -58,8 +58,8 @@ glabel func_800E0CBC /* B57F30 800E0D90 00008025 */ move $s0, $zero .L800E0D94: /* B57F34 800E0D94 8EA83404 */ lw $t0, 0x3404($s5) -/* B57F38 800E0D98 3C118017 */ lui $s1, %hi(D_80172304) # $s1, 0x8017 -/* B57F3C 800E0D9C 26312304 */ addiu $s1, %lo(D_80172304) # addiu $s1, $s1, 0x2304 +/* B57F38 800E0D98 3C118017 */ lui $s1, %hi(gAudioContext+0x3184) # $s1, 0x8017 +/* B57F3C 800E0D9C 26312304 */ addiu $s1, %lo(gAudioContext+0x3184) # addiu $s1, $s1, 0x2304 /* B57F40 800E0DA0 1900000B */ blez $t0, .L800E0DD0 /* B57F44 800E0DA4 02202025 */ move $a0, $s1 .L800E0DA8: diff --git a/asm/non_matchings/code/audio_heap/func_800E0EB4.s b/asm/non_matchings/code/audio_heap/func_800E0EB4.s index 69c2fb0d5b..a1cd0adda1 100644 --- a/asm/non_matchings/code/audio_heap/func_800E0EB4.s +++ b/asm/non_matchings/code/audio_heap/func_800E0EB4.s @@ -70,7 +70,7 @@ glabel func_800E0EB4 /* B58154 800E0FB4 52210054 */ beql $s1, $at, .L800E1108 /* B58158 800E0FB8 8FA90094 */ lw $t1, 0x94($sp) .L800E0FBC: -/* B5815C 800E0FBC 0C03862C */ jal func_800E18B0 +/* B5815C 800E0FBC 0C03862C */ jal Audio_IsBankLoadComplete /* B58160 800E0FC0 02A02025 */ move $a0, $s5 /* B58164 800E0FC4 1040004F */ beqz $v0, .L800E1104 /* B58168 800E0FC8 24040001 */ li $a0, 1 diff --git a/asm/non_matchings/code/audio_heap/func_800E1148.s b/asm/non_matchings/code/audio_heap/func_800E1148.s index ff351eaf13..79c78ea554 100644 --- a/asm/non_matchings/code/audio_heap/func_800E1148.s +++ b/asm/non_matchings/code/audio_heap/func_800E1148.s @@ -1,6 +1,6 @@ glabel func_800E1148 -/* B582E8 800E1148 3C0E8017 */ lui $t6, %hi(D_80171EB2) # $t6, 0x8017 -/* B582EC 800E114C 85CE1EB2 */ lh $t6, %lo(D_80171EB2)($t6) +/* B582E8 800E1148 3C0E8017 */ lui $t6, %hi(gAudioContext+0x2d32) # $t6, 0x8017 +/* B582EC 800E114C 85CE1EB2 */ lh $t6, %lo(gAudioContext+0x2d32)($t6) /* B582F0 800E1150 27BDFFD8 */ addiu $sp, $sp, -0x28 /* B582F4 800E1154 AFB00018 */ sw $s0, 0x18($sp) /* B582F8 800E1158 2410FFFF */ li $s0, -1 @@ -11,17 +11,17 @@ glabel func_800E1148 /* B5830C 800E116C 0C03839B */ jal func_800E0E6C /* B58310 800E1170 01C02025 */ move $a0, $t6 .L800E1174: -/* B58314 800E1174 3C048017 */ lui $a0, %hi(D_80171EBE) # $a0, 0x8017 -/* B58318 800E1178 84841EBE */ lh $a0, %lo(D_80171EBE)($a0) +/* B58314 800E1174 3C048017 */ lui $a0, %hi(gAudioContext+0x2d3e) # $a0, 0x8017 +/* B58318 800E1178 84841EBE */ lh $a0, %lo(gAudioContext+0x2d3e)($a0) /* B5831C 800E117C 12040003 */ beq $s0, $a0, .L800E118C /* B58320 800E1180 00000000 */ nop /* B58324 800E1184 0C03839B */ jal func_800E0E6C /* B58328 800E1188 00000000 */ nop .L800E118C: -/* B5832C 800E118C 3C188017 */ lui $t8, %hi(D_80171DC0) # $t8, 0x8017 -/* B58330 800E1190 8F181DC0 */ lw $t8, %lo(D_80171DC0)($t8) -/* B58334 800E1194 3C0F8017 */ lui $t7, %hi(D_80171DC0) # $t7, 0x8017 -/* B58338 800E1198 25EF1DC0 */ addiu $t7, %lo(D_80171DC0) # addiu $t7, $t7, 0x1dc0 +/* B5832C 800E118C 3C188017 */ lui $t8, %hi(gAudioContext+0x2c40) # $t8, 0x8017 +/* B58330 800E1190 8F181DC0 */ lw $t8, %lo(gAudioContext+0x2c40)($t8) +/* B58334 800E1194 3C0F8017 */ lui $t7, %hi(gAudioContext+0x2c40) # $t7, 0x8017 +/* B58338 800E1198 25EF1DC0 */ addiu $t7, %lo(gAudioContext+0x2c40) # addiu $t7, $t7, 0x1dc0 /* B5833C 800E119C 01E09025 */ move $s2, $t7 /* B58340 800E11A0 1300000A */ beqz $t8, .L800E11CC /* B58344 800E11A4 00008025 */ move $s0, $zero diff --git a/asm/non_matchings/code/audio_seqplayer/Audio_AudioListPopBack.s b/asm/non_matchings/code/audio_seqplayer/Audio_AudioListPopBack.s deleted file mode 100644 index 83d171a52d..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/Audio_AudioListPopBack.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel Audio_AudioListPopBack -/* B60E08 800E9C68 8C830000 */ lw $v1, ($a0) -/* B60E0C 800E9C6C 54640004 */ bnel $v1, $a0, .L800E9C80 -/* B60E10 800E9C70 8C6E0000 */ lw $t6, ($v1) -/* B60E14 800E9C74 03E00008 */ jr $ra -/* B60E18 800E9C78 00001025 */ move $v0, $zero -/* B60E1C 800E9C7C 8C6E0000 */ lw $t6, ($v1) -.L800E9C80: -/* B60E20 800E9C80 ADC40004 */ sw $a0, 4($t6) -/* B60E24 800E9C84 8C6F0000 */ lw $t7, ($v1) -/* B60E28 800E9C88 AC8F0000 */ sw $t7, ($a0) -/* B60E2C 800E9C8C AC600000 */ sw $zero, ($v1) -/* B60E30 800E9C90 8C980008 */ lw $t8, 8($a0) -/* B60E34 800E9C94 2719FFFF */ addiu $t9, $t8, -1 -/* B60E38 800E9C98 AC990008 */ sw $t9, 8($a0) -/* B60E3C 800E9C9C 8C620008 */ lw $v0, 8($v1) -/* B60E40 800E9CA0 03E00008 */ jr $ra -/* B60E44 800E9CA4 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/Audio_AudioListPushBack.s b/asm/non_matchings/code/audio_seqplayer/Audio_AudioListPushBack.s deleted file mode 100644 index 9eb6062f1a..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/Audio_AudioListPushBack.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel Audio_AudioListPushBack -/* B60DC8 800E9C28 8CAE0000 */ lw $t6, ($a1) -/* B60DCC 800E9C2C 15C0000C */ bnez $t6, .L800E9C60 -/* B60DD0 800E9C30 00000000 */ nop -/* B60DD4 800E9C34 8C8F0000 */ lw $t7, ($a0) -/* B60DD8 800E9C38 ADE50004 */ sw $a1, 4($t7) -/* B60DDC 800E9C3C 8C980000 */ lw $t8, ($a0) -/* B60DE0 800E9C40 ACA40004 */ sw $a0, 4($a1) -/* B60DE4 800E9C44 ACB80000 */ sw $t8, ($a1) -/* B60DE8 800E9C48 8C990008 */ lw $t9, 8($a0) -/* B60DEC 800E9C4C 8C89000C */ lw $t1, 0xc($a0) -/* B60DF0 800E9C50 AC850000 */ sw $a1, ($a0) -/* B60DF4 800E9C54 27280001 */ addiu $t0, $t9, 1 -/* B60DF8 800E9C58 AC880008 */ sw $t0, 8($a0) -/* B60DFC 800E9C5C ACA9000C */ sw $t1, 0xc($a1) -.L800E9C60: -/* B60E00 800E9C60 03E00008 */ jr $ra -/* B60E04 800E9C64 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/Audio_SequenceChannelDisable.s b/asm/non_matchings/code/audio_seqplayer/Audio_SequenceChannelDisable.s deleted file mode 100644 index dacd9beaba..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/Audio_SequenceChannelDisable.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel Audio_SequenceChannelDisable -/* B60A68 800E98C8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B60A6C 800E98CC AFB20020 */ sw $s2, 0x20($sp) -/* B60A70 800E98D0 AFB1001C */ sw $s1, 0x1c($sp) -/* B60A74 800E98D4 AFB00018 */ sw $s0, 0x18($sp) -/* B60A78 800E98D8 00808825 */ move $s1, $a0 -/* B60A7C 800E98DC AFBF0024 */ sw $ra, 0x24($sp) -/* B60A80 800E98E0 00008025 */ move $s0, $zero -/* B60A84 800E98E4 24120004 */ li $s2, 4 -/* B60A88 800E98E8 02202025 */ move $a0, $s1 -.L800E98EC: -/* B60A8C 800E98EC 0C03A61E */ jal func_800E9878 -/* B60A90 800E98F0 02002825 */ move $a1, $s0 -/* B60A94 800E98F4 26100001 */ addiu $s0, $s0, 1 -/* B60A98 800E98F8 5612FFFC */ bnel $s0, $s2, .L800E98EC -/* B60A9C 800E98FC 02202025 */ move $a0, $s1 -/* B60AA0 800E9900 0C039F80 */ jal Audio_NotePoolClear -/* B60AA4 800E9904 26240084 */ addiu $a0, $s1, 0x84 -/* B60AA8 800E9908 922E0000 */ lbu $t6, ($s1) -/* B60AAC 800E990C 31D9FF7F */ andi $t9, $t6, 0xff7f -/* B60AB0 800E9910 A2390000 */ sb $t9, ($s1) -/* B60AB4 800E9914 37280040 */ ori $t0, $t9, 0x40 -/* B60AB8 800E9918 A2280000 */ sb $t0, ($s1) -/* B60ABC 800E991C 8FBF0024 */ lw $ra, 0x24($sp) -/* B60AC0 800E9920 8FB20020 */ lw $s2, 0x20($sp) -/* B60AC4 800E9924 8FB1001C */ lw $s1, 0x1c($sp) -/* B60AC8 800E9928 8FB00018 */ lw $s0, 0x18($sp) -/* B60ACC 800E992C 03E00008 */ jr $ra -/* B60AD0 800E9930 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800EB068.s b/asm/non_matchings/code/audio_seqplayer/Audio_SequenceChannelProcessScript.s similarity index 95% rename from asm/non_matchings/code/audio_seqplayer/func_800EB068.s rename to asm/non_matchings/code/audio_seqplayer/Audio_SequenceChannelProcessScript.s index 29ac91b8f8..24f59c8d88 100644 --- a/asm/non_matchings/code/audio_seqplayer/func_800EB068.s +++ b/asm/non_matchings/code/audio_seqplayer/Audio_SequenceChannelProcessScript.s @@ -210,7 +210,7 @@ glabel jtbl_80149860 .word L800EBC4C .text -glabel func_800EB068 +glabel Audio_SequenceChannelProcessScript /* B62208 800EB068 27BDFF78 */ addiu $sp, $sp, -0x88 /* B6220C 800EB06C AFBF003C */ sw $ra, 0x3c($sp) /* B62210 800EB070 AFBE0038 */ sw $fp, 0x38($sp) @@ -251,7 +251,7 @@ glabel func_800EB068 /* B62290 800EB0F0 241EFFFF */ li $fp, -1 .L800EB0F4: glabel L800EB0F4 -/* B62294 800EB0F4 0C03A752 */ jal func_800E9D48 +/* B62294 800EB0F4 0C03A752 */ jal Audio_M64ReadU8 /* B62298 800EB0F8 02C02025 */ move $a0, $s6 /* B6229C 800EB0FC 284100B0 */ slti $at, $v0, 0xb0 /* B622A0 800EB100 305200FF */ andi $s2, $v0, 0xff @@ -271,12 +271,12 @@ glabel L800EB0F4 /* B622D4 800EB134 30780080 */ andi $t8, $v1, 0x80 /* B622D8 800EB138 17000005 */ bnez $t8, .L800EB150 /* B622DC 800EB13C 00608825 */ move $s1, $v1 -/* B622E0 800EB140 0C03A752 */ jal func_800E9D48 +/* B622E0 800EB140 0C03A752 */ jal Audio_M64ReadU8 /* B622E4 800EB144 02C02025 */ move $a0, $s6 /* B622E8 800EB148 10000004 */ b .L800EB15C /* B622EC 800EB14C AE020000 */ sw $v0, ($s0) .L800EB150: -/* B622F0 800EB150 0C03A757 */ jal func_800E9D5C +/* B622F0 800EB150 0C03A757 */ jal Audio_M64ReadS16 /* B622F4 800EB154 02C02025 */ move $a0, $s6 /* B622F8 800EB158 AE020000 */ sw $v0, ($s0) .L800EB15C: @@ -293,7 +293,7 @@ glabel L800EB0F4 /* B62320 800EB180 02E02025 */ move $a0, $s7 /* B62324 800EB184 02C02825 */ move $a1, $s6 /* B62328 800EB188 02003025 */ move $a2, $s0 -/* B6232C 800EB18C 0C03A4EA */ jal func_800E93A8 +/* B6232C 800EB18C 0C03A4EA */ jal Audio_HandleScriptFlowControl /* B62330 800EB190 8FA70060 */ lw $a3, 0x60($sp) /* B62334 800EB194 1040FFD7 */ beqz $v0, .L800EB0F4 /* B62338 800EB198 00000000 */ nop @@ -364,8 +364,8 @@ glabel L800EB270 /* B6241C 800EB27C 1161000D */ beq $t3, $at, .L800EB2B4 /* B62420 800EB280 01409025 */ move $s2, $t2 /* B62424 800EB284 92EC0004 */ lbu $t4, 4($s7) -/* B62428 800EB288 3C028017 */ lui $v0, %hi(D_801719BC) # $v0, 0x8017 -/* B6242C 800EB28C 8C4219BC */ lw $v0, %lo(D_801719BC)($v0) +/* B62428 800EB288 3C028017 */ lui $v0, %hi(gAudioContext+0x283c) # $v0, 0x8017 +/* B6242C 800EB28C 8C4219BC */ lw $v0, %lo(gAudioContext+0x283c)($v0) /* B62430 800EB290 000C6840 */ sll $t5, $t4, 1 /* B62434 800EB294 004D7821 */ addu $t7, $v0, $t5 /* B62438 800EB298 95F10000 */ lhu $s1, ($t7) @@ -388,7 +388,7 @@ glabel L800EB270 /* B62474 800EB2D4 AFA90060 */ sw $t1, 0x60($sp) glabel L800EB2D8 /* B62478 800EB2D8 93A50063 */ lbu $a1, 0x63($sp) -/* B6247C 800EB2DC 0C03ABE6 */ jal func_800EAF98 +/* B6247C 800EB2DC 0C03ABE6 */ jal Audio_SetInstrument /* B62480 800EB2E0 02802025 */ move $a0, $s4 /* B62484 800EB2E4 1000FF83 */ b .L800EB0F4 /* B62488 800EB2E8 00000000 */ nop @@ -404,7 +404,7 @@ glabel L800EB2FC /* B624A8 800EB308 A2980000 */ sb $t8, ($s4) glabel L800EB30C /* B624AC 800EB30C 93A50063 */ lbu $a1, 0x63($sp) -/* B624B0 800EB310 0C03AC11 */ jal func_800EB044 +/* B624B0 800EB310 0C03AC11 */ jal Audio_SequenceChannelSetVolume /* B624B4 800EB314 02802025 */ move $a0, $s4 /* B624B8 800EB318 928A0001 */ lbu $t2, 1($s4) /* B624BC 800EB31C 35590040 */ ori $t9, $t2, 0x40 @@ -540,8 +540,8 @@ glabel L800EB4D8 /* B62684 800EB4E4 1121000D */ beq $t1, $at, .L800EB51C /* B62688 800EB4E8 01009025 */ move $s2, $t0 /* B6268C 800EB4EC 92EB0004 */ lbu $t3, 4($s7) -/* B62690 800EB4F0 3C028017 */ lui $v0, %hi(D_801719BC) # $v0, 0x8017 -/* B62694 800EB4F4 8C4219BC */ lw $v0, %lo(D_801719BC)($v0) +/* B62690 800EB4F0 3C028017 */ lui $v0, %hi(gAudioContext+0x283c) # $v0, 0x8017 +/* B62694 800EB4F4 8C4219BC */ lw $v0, %lo(gAudioContext+0x283c)($v0) /* B62698 800EB4F8 000B6040 */ sll $t4, $t3, 1 /* B6269C 800EB4FC 004C6821 */ addu $t5, $v0, $t4 /* B626A0 800EB500 95B10000 */ lhu $s1, ($t5) @@ -717,21 +717,21 @@ glabel L800EB748 /* B628F8 800EB758 A28F0002 */ sb $t7, 2($s4) /* B628FC 800EB75C 0C03ABBD */ jal func_800EAEF4 /* B62900 800EB760 93A5006B */ lbu $a1, 0x6b($sp) -/* B62904 800EB764 0C03A752 */ jal func_800E9D48 +/* B62904 800EB764 0C03A752 */ jal Audio_M64ReadU8 /* B62908 800EB768 02C02025 */ move $a0, $s6 /* B6290C 800EB76C 0002C600 */ sll $t8, $v0, 0x18 /* B62910 800EB770 00184603 */ sra $t0, $t8, 0x18 /* B62914 800EB774 A6880026 */ sh $t0, 0x26($s4) -/* B62918 800EB778 0C03A752 */ jal func_800E9D48 +/* B62918 800EB778 0C03A752 */ jal Audio_M64ReadU8 /* B6291C 800EB77C 02C02025 */ move $a0, $s6 /* B62920 800EB780 A282000A */ sb $v0, 0xa($s4) -/* B62924 800EB784 0C03A752 */ jal func_800E9D48 +/* B62924 800EB784 0C03A752 */ jal Audio_M64ReadU8 /* B62928 800EB788 02C02025 */ move $a0, $s6 /* B6292C 800EB78C A282000B */ sb $v0, 0xb($s4) -/* B62930 800EB790 0C03A752 */ jal func_800E9D48 +/* B62930 800EB790 0C03A752 */ jal Audio_M64ReadU8 /* B62934 800EB794 02C02025 */ move $a0, $s6 /* B62938 800EB798 A2820004 */ sb $v0, 4($s4) -/* B6293C 800EB79C 0C03A752 */ jal func_800E9D48 +/* B6293C 800EB79C 0C03A752 */ jal Audio_M64ReadU8 /* B62940 800EB7A0 02C02025 */ move $a0, $s6 /* B62944 800EB7A4 928E0001 */ lbu $t6, 1($s4) /* B62948 800EB7A8 A2820008 */ sb $v0, 8($s4) @@ -822,16 +822,16 @@ glabel L800EB8C0 /* B62A74 800EB8D4 A2CE0019 */ sb $t6, 0x19($s6) glabel L800EB8D8 /* B62A78 800EB8D8 8FB90060 */ lw $t9, 0x60($sp) -/* B62A7C 800EB8DC 3C0C8017 */ lui $t4, %hi(D_80171AFC) # $t4, 0x8017 +/* B62A7C 800EB8DC 3C0C8017 */ lui $t4, %hi(gAudioContext+0x297c) # $t4, 0x8017 /* B62A80 800EB8E0 8FAB0060 */ lw $t3, 0x60($sp) /* B62A84 800EB8E4 17200005 */ bnez $t9, .L800EB8FC /* B62A88 800EB8E8 00000000 */ nop -/* B62A8C 800EB8EC 3C0D8017 */ lui $t5, %hi(D_80171AFC) # $t5, 0x8017 -/* B62A90 800EB8F0 8DA91AFC */ lw $t1, %lo(D_80171AFC)($t5) +/* B62A8C 800EB8EC 3C0D8017 */ lui $t5, %hi(gAudioContext+0x297c) # $t5, 0x8017 +/* B62A90 800EB8F0 8DA91AFC */ lw $t1, %lo(gAudioContext+0x297c)($t5) /* B62A94 800EB8F4 1000FDFF */ b .L800EB0F4 /* B62A98 800EB8F8 A6890022 */ sh $t1, 0x22($s4) .L800EB8FC: -/* B62A9C 800EB8FC 8D8C1AFC */ lw $t4, %lo(D_80171AFC)($t4) +/* B62A9C 800EB8FC 8D8C1AFC */ lw $t4, %lo(gAudioContext+0x297c)($t4) /* B62AA0 800EB900 018B001B */ divu $zero, $t4, $t3 /* B62AA4 800EB904 00007810 */ mfhi $t7 /* B62AA8 800EB908 A68F0022 */ sh $t7, 0x22($s4) @@ -843,16 +843,16 @@ glabel L800EB8D8 /* B62ABC 800EB91C 00000000 */ nop glabel L800EB920 /* B62AC0 800EB920 8FB80060 */ lw $t8, 0x60($sp) -/* B62AC4 800EB924 3C0E8017 */ lui $t6, %hi(D_80171AFC) # $t6, 0x8017 +/* B62AC4 800EB924 3C0E8017 */ lui $t6, %hi(gAudioContext+0x297c) # $t6, 0x8017 /* B62AC8 800EB928 8FB90060 */ lw $t9, 0x60($sp) /* B62ACC 800EB92C 17000005 */ bnez $t8, .L800EB944 /* B62AD0 800EB930 00000000 */ nop -/* B62AD4 800EB934 3C088017 */ lui $t0, %hi(D_80171AFC) # $t0, 0x8017 -/* B62AD8 800EB938 8D0A1AFC */ lw $t2, %lo(D_80171AFC)($t0) +/* B62AD4 800EB934 3C088017 */ lui $t0, %hi(gAudioContext+0x297c) # $t0, 0x8017 +/* B62AD8 800EB938 8D0A1AFC */ lw $t2, %lo(gAudioContext+0x297c)($t0) /* B62ADC 800EB93C 1000FDED */ b .L800EB0F4 /* B62AE0 800EB940 A2CA0019 */ sb $t2, 0x19($s6) .L800EB944: -/* B62AE4 800EB944 8DCE1AFC */ lw $t6, %lo(D_80171AFC)($t6) +/* B62AE4 800EB944 8DCE1AFC */ lw $t6, %lo(gAudioContext+0x297c)($t6) /* B62AE8 800EB948 01D9001B */ divu $zero, $t6, $t9 /* B62AEC 800EB94C 00006810 */ mfhi $t5 /* B62AF0 800EB950 A2CD0019 */ sb $t5, 0x19($s6) @@ -960,11 +960,11 @@ glabel L800EBA84 /* B62C4C 800EBAAC 1000FD91 */ b .L800EB0F4 /* B62C50 800EBAB0 A2DE0019 */ sb $fp, 0x19($s6) glabel L800EBAB4 -/* B62C54 800EBAB4 0C03A757 */ jal func_800E9D5C +/* B62C54 800EBAB4 0C03A757 */ jal Audio_M64ReadS16 /* B62C58 800EBAB8 02C02025 */ move $a0, $s6 /* B62C5C 800EBABC 3051FFFF */ andi $s1, $v0, 0xffff /* B62C60 800EBAC0 02802025 */ move $a0, $s4 -/* B62C64 800EBAC4 0C03A5B6 */ jal func_800E96D8 +/* B62C64 800EBAC4 0C03A5B6 */ jal Audio_SeqChannelSetLayer /* B62C68 800EBAC8 02A02825 */ move $a1, $s5 /* B62C6C 800EBACC 1440FD89 */ bnez $v0, .L800EB0F4 /* B62C70 800EBAD0 00154080 */ sll $t0, $s5, 2 @@ -976,7 +976,7 @@ glabel L800EBAB4 /* B62C88 800EBAE8 ADD80054 */ sw $t8, 0x54($t6) glabel L800EBAEC /* B62C8C 800EBAEC 02802025 */ move $a0, $s4 -/* B62C90 800EBAF0 0C03A61E */ jal func_800E9878 +/* B62C90 800EBAF0 0C03A61E */ jal Audio_SeqChannelLayerFree /* B62C94 800EBAF4 02A02825 */ move $a1, $s5 /* B62C98 800EBAF8 1000FD7E */ b .L800EB0F4 /* B62C9C 800EBAFC 00000000 */ nop @@ -985,7 +985,7 @@ glabel L800EBB00 /* B62CA4 800EBB04 02802025 */ move $a0, $s4 /* B62CA8 800EBB08 13D9FD7A */ beq $fp, $t9, .L800EB0F4 /* B62CAC 800EBB0C 00000000 */ nop -/* B62CB0 800EBB10 0C03A5B6 */ jal func_800E96D8 +/* B62CB0 800EBB10 0C03A5B6 */ jal Audio_SeqChannelSetLayer /* B62CB4 800EBB14 02A02825 */ move $a1, $s5 /* B62CB8 800EBB18 105EFD76 */ beq $v0, $fp, .L800EB0F4 /* B62CBC 800EBB1C 00157080 */ sll $t6, $s5, 2 @@ -1010,12 +1010,12 @@ glabel L800EBB5C /* B62D04 800EBB64 1000FD63 */ b .L800EB0F4 /* B62D08 800EBB68 A18D00C4 */ sb $t5, 0xc4($t4) glabel L800EBB6C -/* B62D0C 800EBB6C 0C03A757 */ jal func_800E9D5C +/* B62D0C 800EBB6C 0C03A757 */ jal Audio_M64ReadS16 /* B62D10 800EBB70 02C02025 */ move $a0, $s6 /* B62D14 800EBB74 00028400 */ sll $s0, $v0, 0x10 /* B62D18 800EBB78 00108403 */ sra $s0, $s0, 0x10 /* B62D1C 800EBB7C 02802025 */ move $a0, $s4 -/* B62D20 800EBB80 0C03A5B6 */ jal func_800E96D8 +/* B62D20 800EBB80 0C03A5B6 */ jal Audio_SeqChannelSetLayer /* B62D24 800EBB84 02A02825 */ move $a1, $s5 /* B62D28 800EBB88 1440FD5A */ bnez $v0, .L800EB0F4 /* B62D2C 800EBB8C 00154080 */ sll $t0, $s5, 2 @@ -1088,19 +1088,19 @@ glabel L800EBC6C /* B62E20 800EBC80 1000FD1C */ b .L800EB0F4 /* B62E24 800EBC84 A2D90019 */ sb $t9, 0x19($s6) glabel L800EBC88 -/* B62E28 800EBC88 0C03A757 */ jal func_800E9D5C +/* B62E28 800EBC88 0C03A757 */ jal Audio_M64ReadS16 /* B62E2C 800EBC8C 02C02025 */ move $a0, $s6 /* B62E30 800EBC90 8EF80018 */ lw $t8, 0x18($s7) /* B62E34 800EBC94 02402825 */ move $a1, $s2 /* B62E38 800EBC98 3049FFFF */ andi $t1, $v0, 0xffff /* B62E3C 800EBC9C 30A5000F */ andi $a1, $a1, 0xf /* B62E40 800EBCA0 02E02025 */ move $a0, $s7 -/* B62E44 800EBCA4 0C03A6AB */ jal func_800E9AAC +/* B62E44 800EBCA4 0C03A6AB */ jal Audio_SequenceChannelEnable /* B62E48 800EBCA8 03093021 */ addu $a2, $t8, $t1 /* B62E4C 800EBCAC 1000FD11 */ b .L800EB0F4 /* B62E50 800EBCB0 00000000 */ nop glabel L800EBCB4 -/* B62E54 800EBCB4 0C03A752 */ jal func_800E9D48 +/* B62E54 800EBCB4 0C03A752 */ jal Audio_M64ReadU8 /* B62E58 800EBCB8 02C02025 */ move $a0, $s6 /* B62E5C 800EBCBC 00156080 */ sll $t4, $s5, 2 /* B62E60 800EBCC0 02EC7821 */ addu $t7, $s7, $t4 @@ -1110,7 +1110,7 @@ glabel L800EBCB4 /* B62E70 800EBCD0 1000FD08 */ b .L800EB0F4 /* B62E74 800EBCD4 A16D00C4 */ sb $t5, 0xc4($t3) glabel L800EBCD8 -/* B62E78 800EBCD8 0C03A752 */ jal func_800E9D48 +/* B62E78 800EBCD8 0C03A752 */ jal Audio_M64ReadU8 /* B62E7C 800EBCDC 02C02025 */ move $a0, $s6 /* B62E80 800EBCE0 00154080 */ sll $t0, $s5, 2 /* B62E84 800EBCE4 02E87021 */ addu $t6, $s7, $t0 @@ -1128,7 +1128,7 @@ glabel L800EBCD8 /* B62EA8 800EBD08 8E240050 */ lw $a0, 0x50($s1) /* B62EAC 800EBD0C 50800004 */ beql $a0, $zero, .L800EBD20 /* B62EB0 800EBD10 26100004 */ addiu $s0, $s0, 4 -/* B62EB4 800EBD14 0C03A775 */ jal func_800E9DD4 +/* B62EB4 800EBD14 0C03A775 */ jal Audio_SeqChannelLayerProcessScript /* B62EB8 800EBD18 00000000 */ nop /* B62EBC 800EBD1C 26100004 */ addiu $s0, $s0, 4 .L800EBD20: diff --git a/asm/non_matchings/code/audio_seqplayer/Audio_SequencePlayerDisable.s b/asm/non_matchings/code/audio_seqplayer/Audio_SequencePlayerDisable.s deleted file mode 100644 index 5255581c16..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/Audio_SequencePlayerDisable.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel Audio_SequencePlayerDisable -/* B60D0C 800E9B6C 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B60D10 800E9B70 AFBF001C */ sw $ra, 0x1c($sp) -/* B60D14 800E9B74 AFB00018 */ sw $s0, 0x18($sp) -/* B60D18 800E9B78 00808025 */ move $s0, $a0 -/* B60D1C 800E9B7C 0C03A68B */ jal func_800E9A2C -/* B60D20 800E9B80 3405FFFF */ li $a1, 65535 -/* B60D24 800E9B84 0C039F80 */ jal Audio_NotePoolClear -/* B60D28 800E9B88 2604009C */ addiu $a0, $s0, 0x9c -/* B60D2C 800E9B8C 8E0E0000 */ lw $t6, ($s0) -/* B60D30 800E9B90 000E7FC2 */ srl $t7, $t6, 0x1f -/* B60D34 800E9B94 51E00020 */ beql $t7, $zero, .L800E9C18 -/* B60D38 800E9B98 8FBF001C */ lw $ra, 0x1c($sp) -/* B60D3C 800E9B9C 92180000 */ lbu $t8, ($s0) -/* B60D40 800E9BA0 92040004 */ lbu $a0, 4($s0) -/* B60D44 800E9BA4 3309FF7F */ andi $t1, $t8, 0xff7f -/* B60D48 800E9BA8 A2090000 */ sb $t1, ($s0) -/* B60D4C 800E9BAC 352A0040 */ ori $t2, $t1, 0x40 -/* B60D50 800E9BB0 0C03864A */ jal func_800E1928 -/* B60D54 800E9BB4 A20A0000 */ sb $t2, ($s0) -/* B60D58 800E9BB8 10400003 */ beqz $v0, .L800E9BC8 -/* B60D5C 800E9BBC 24050003 */ li $a1, 3 -/* B60D60 800E9BC0 0C038692 */ jal func_800E1A48 -/* B60D64 800E9BC4 92040004 */ lbu $a0, 4($s0) -.L800E9BC8: -/* B60D68 800E9BC8 0C03862C */ jal func_800E18B0 -/* B60D6C 800E9BCC 92040005 */ lbu $a0, 5($s0) -/* B60D70 800E9BD0 10400003 */ beqz $v0, .L800E9BE0 -/* B60D74 800E9BD4 24050004 */ li $a1, 4 -/* B60D78 800E9BD8 0C038686 */ jal func_800E1A18 -/* B60D7C 800E9BDC 92040005 */ lbu $a0, 5($s0) -.L800E9BE0: -/* B60D80 800E9BE0 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 -/* B60D84 800E9BE4 2463F180 */ addiu $v1, %lo(gAudioContext) # addiu $v1, $v1, -0xe80 -/* B60D88 800E9BE8 846B2C22 */ lh $t3, 0x2c22($v1) -/* B60D8C 800E9BEC 92020005 */ lbu $v0, 5($s0) -/* B60D90 800E9BF0 544B0004 */ bnel $v0, $t3, .L800E9C04 -/* B60D94 800E9BF4 846C2C2E */ lh $t4, 0x2c2e($v1) -/* B60D98 800E9BF8 10000006 */ b .L800E9C14 -/* B60D9C 800E9BFC AC602C04 */ sw $zero, 0x2c04($v1) -/* B60DA0 800E9C00 846C2C2E */ lh $t4, 0x2c2e($v1) -.L800E9C04: -/* B60DA4 800E9C04 240D0001 */ li $t5, 1 -/* B60DA8 800E9C08 544C0003 */ bnel $v0, $t4, .L800E9C18 -/* B60DAC 800E9C0C 8FBF001C */ lw $ra, 0x1c($sp) -/* B60DB0 800E9C10 AC6D2C04 */ sw $t5, 0x2c04($v1) -.L800E9C14: -/* B60DB4 800E9C14 8FBF001C */ lw $ra, 0x1c($sp) -.L800E9C18: -/* B60DB8 800E9C18 8FB00018 */ lw $s0, 0x18($sp) -/* B60DBC 800E9C1C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B60DC0 800E9C20 03E00008 */ jr $ra -/* B60DC4 800E9C24 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800EBD58.s b/asm/non_matchings/code/audio_seqplayer/Audio_SequencePlayerProcessSequence.s similarity index 89% rename from asm/non_matchings/code/audio_seqplayer/func_800EBD58.s rename to asm/non_matchings/code/audio_seqplayer/Audio_SequencePlayerProcessSequence.s index baa46e7264..e30c6b5d17 100644 --- a/asm/non_matchings/code/audio_seqplayer/func_800EBD58.s +++ b/asm/non_matchings/code/audio_seqplayer/Audio_SequencePlayerProcessSequence.s @@ -163,7 +163,7 @@ glabel jtbl_80149A9C .word L800EC4A8 .text -glabel func_800EBD58 +glabel Audio_SequencePlayerProcessSequence /* B62EF8 800EBD58 27BDFF98 */ addiu $sp, $sp, -0x68 /* B62EFC 800EBD5C AFBF0024 */ sw $ra, 0x24($sp) /* B62F00 800EBD60 AFB20020 */ sw $s2, 0x20($sp) @@ -174,11 +174,11 @@ glabel func_800EBD58 /* B62F14 800EBD74 000E7FC2 */ srl $t7, $t6, 0x1f /* B62F18 800EBD78 51E001F5 */ beql $t7, $zero, .L800EC550 /* B62F1C 800EBD7C 8FBF0024 */ lw $ra, 0x24($sp) -/* B62F20 800EBD80 0C03864A */ jal func_800E1928 +/* B62F20 800EBD80 0C03864A */ jal Audio_IsSeqLoadComplete /* B62F24 800EBD84 90840004 */ lbu $a0, 4($a0) /* B62F28 800EBD88 10400005 */ beqz $v0, .L800EBDA0 /* B62F2C 800EBD8C 00000000 */ nop -/* B62F30 800EBD90 0C03862C */ jal func_800E18B0 +/* B62F30 800EBD90 0C03862C */ jal Audio_IsBankLoadComplete /* B62F34 800EBD94 92440005 */ lbu $a0, 5($s2) /* B62F38 800EBD98 14400005 */ bnez $v0, .L800EBDB0 /* B62F3C 800EBD9C 24050002 */ li $a1, 2 @@ -188,13 +188,13 @@ glabel func_800EBD58 /* B62F48 800EBDA8 100001E9 */ b .L800EC550 /* B62F4C 800EBDAC 8FBF0024 */ lw $ra, 0x24($sp) .L800EBDB0: -/* B62F50 800EBDB0 0C038692 */ jal func_800E1A48 +/* B62F50 800EBDB0 0C038692 */ jal Audio_SetSeqLoadStatus /* B62F54 800EBDB4 92440004 */ lbu $a0, 4($s2) /* B62F58 800EBDB8 92440005 */ lbu $a0, 5($s2) -/* B62F5C 800EBDBC 0C038686 */ jal func_800E1A18 +/* B62F5C 800EBDBC 0C038686 */ jal Audio_SetBankLoadStatus /* B62F60 800EBDC0 24050002 */ li $a1, 2 /* B62F64 800EBDC4 8E580000 */ lw $t8, ($s2) -/* B62F68 800EBDC8 3C048017 */ lui $a0, %hi(D_80171A18) +/* B62F68 800EBDC8 3C048017 */ lui $a0, %hi(gAudioContext+0x2898) /* B62F6C 800EBDCC 00184080 */ sll $t0, $t8, 2 /* B62F70 800EBDD0 05030006 */ bgezl $t0, .L800EBDEC /* B62F74 800EBDD4 964D000A */ lhu $t5, 0xa($s2) @@ -213,7 +213,7 @@ glabel func_800EBD58 /* B62FA4 800EBE04 03194021 */ addu $t0, $t8, $t9 /* B62FA8 800EBE08 AE4C00E0 */ sw $t4, 0xe0($s2) /* B62FAC 800EBE0C A648000A */ sh $t0, 0xa($s2) -/* B62FB0 800EBE10 84841A18 */ lh $a0, %lo(D_80171A18)($a0) +/* B62FB0 800EBE10 84841A18 */ lh $a0, %lo(gAudioContext+0x2898)($a0) /* B62FB4 800EBE14 3102FFFF */ andi $v0, $t0, 0xffff /* B62FB8 800EBE18 0044082A */ slt $at, $v0, $a0 /* B62FBC 800EBE1C 542001CC */ bnezl $at, .L800EC550 @@ -238,18 +238,18 @@ glabel func_800EBD58 /* B63004 800EBE64 A2590000 */ sb $t9, ($s2) .L800EBE68: glabel L800EBE68 -/* B63008 800EBE68 0C03A752 */ jal func_800E9D48 +/* B63008 800EBE68 0C03A752 */ jal Audio_M64ReadU8 /* B6300C 800EBE6C 02202025 */ move $a0, $s1 /* B63010 800EBE70 284100F2 */ slti $at, $v0, 0xf2 /* B63014 800EBE74 14200014 */ bnez $at, .L800EBEC8 /* B63018 800EBE78 305000FF */ andi $s0, $v0, 0xff /* B6301C 800EBE7C 02202025 */ move $a0, $s1 -/* B63020 800EBE80 0C03A4D0 */ jal func_800E9340 +/* B63020 800EBE80 0C03A4D0 */ jal Audio_GetScriptControlFlowArgument /* B63024 800EBE84 320500FF */ andi $a1, $s0, 0xff /* B63028 800EBE88 02402025 */ move $a0, $s2 /* B6302C 800EBE8C 02202825 */ move $a1, $s1 /* B63030 800EBE90 02003025 */ move $a2, $s0 -/* B63034 800EBE94 0C03A4EA */ jal func_800E93A8 +/* B63034 800EBE94 0C03A4EA */ jal Audio_HandleScriptFlowControl /* B63038 800EBE98 00403825 */ move $a3, $v0 /* B6303C 800EBE9C 1040FFF2 */ beqz $v0, .L800EBE68 /* B63040 800EBEA0 00000000 */ nop @@ -281,7 +281,7 @@ glabel L800EBEFC /* B6309C 800EBEFC 2650009C */ addiu $s0, $s2, 0x9c /* B630A0 800EBF00 0C039F80 */ jal Audio_NotePoolClear /* B630A4 800EBF04 02002025 */ move $a0, $s0 -/* B630A8 800EBF08 0C03A752 */ jal func_800E9D48 +/* B630A8 800EBF08 0C03A752 */ jal Audio_M64ReadU8 /* B630AC 800EBF0C 02202025 */ move $a0, $s1 /* B630B0 800EBF10 02002025 */ move $a0, $s0 /* B630B4 800EBF14 0C039FD8 */ jal Audio_NotePoolFill @@ -298,7 +298,7 @@ glabel L800EBF2C glabel L800EBF3C /* B630DC 800EBF3C A640000E */ sh $zero, 0xe($s2) glabel L800EBF40 -/* B630E0 800EBF40 0C03A752 */ jal func_800E9D48 +/* B630E0 800EBF40 0C03A752 */ jal Audio_M64ReadU8 /* B630E4 800EBF44 02202025 */ move $a0, $s1 /* B630E8 800EBF48 8649000E */ lh $t1, 0xe($s2) /* B630EC 800EBF4C 00025600 */ sll $t2, $v0, 0x18 @@ -307,14 +307,14 @@ glabel L800EBF40 /* B630F8 800EBF58 1000FFC3 */ b .L800EBE68 /* B630FC 800EBF5C A64C000E */ sh $t4, 0xe($s2) glabel L800EBF60 -/* B63100 800EBF60 0C03A752 */ jal func_800E9D48 +/* B63100 800EBF60 0C03A752 */ jal Audio_M64ReadU8 /* B63104 800EBF64 02202025 */ move $a0, $s1 /* B63108 800EBF68 00026880 */ sll $t5, $v0, 2 /* B6310C 800EBF6C 01A26823 */ subu $t5, $t5, $v0 /* B63110 800EBF70 000D6900 */ sll $t5, $t5, 4 /* B63114 800EBF74 A64D0008 */ sh $t5, 8($s2) -/* B63118 800EBF78 3C048017 */ lui $a0, %hi(D_80171A18) -/* B6311C 800EBF7C 84841A18 */ lh $a0, %lo(D_80171A18)($a0) +/* B63118 800EBF78 3C048017 */ lui $a0, %hi(gAudioContext+0x2898) +/* B6311C 800EBF7C 84841A18 */ lh $a0, %lo(gAudioContext+0x2898)($a0) /* B63120 800EBF80 31A3FFFF */ andi $v1, $t5, 0xffff /* B63124 800EBF84 24180001 */ li $t8, 1 /* B63128 800EBF88 0083082A */ slt $at, $a0, $v1 @@ -330,7 +330,7 @@ glabel L800EBF60 /* B6314C 800EBFAC 1000FFAE */ b .L800EBE68 /* B63150 800EBFB0 A6580008 */ sh $t8, 8($s2) glabel L800EBFB4 -/* B63154 800EBFB4 0C03A752 */ jal func_800E9D48 +/* B63154 800EBFB4 0C03A752 */ jal Audio_M64ReadU8 /* B63158 800EBFB8 02202025 */ move $a0, $s1 /* B6315C 800EBFBC 0002CE00 */ sll $t9, $v0, 0x18 /* B63160 800EBFC0 00194603 */ sra $t0, $t9, 0x18 @@ -340,10 +340,10 @@ glabel L800EBFB4 /* B63170 800EBFD0 1000FFA5 */ b .L800EBE68 /* B63174 800EBFD4 A64A000C */ sh $t2, 0xc($s2) glabel L800EBFD8 -/* B63178 800EBFD8 0C03A752 */ jal func_800E9D48 +/* B63178 800EBFD8 0C03A752 */ jal Audio_M64ReadU8 /* B6317C 800EBFDC 02202025 */ move $a0, $s1 /* B63180 800EBFE0 305000FF */ andi $s0, $v0, 0xff -/* B63184 800EBFE4 0C03A757 */ jal func_800E9D5C +/* B63184 800EBFE4 0C03A757 */ jal Audio_M64ReadS16 /* B63188 800EBFE8 02202025 */ move $a0, $s1 /* B6318C 800EBFEC 12000008 */ beqz $s0, .L800EC010 /* B63190 800EBFF0 02002025 */ move $a0, $s0 @@ -374,7 +374,7 @@ glabel L800EBFD8 /* B631EC 800EC04C 1000FF86 */ b .L800EBE68 /* B631F0 800EC050 E6520020 */ swc1 $f18, 0x20($s2) glabel L800EC054 -/* B631F4 800EC054 0C03A752 */ jal func_800E9D48 +/* B631F4 800EC054 0C03A752 */ jal Audio_M64ReadU8 /* B631F8 800EC058 02202025 */ move $a0, $s1 /* B631FC 800EC05C 92430001 */ lbu $v1, 1($s2) /* B63200 800EC060 24010001 */ li $at, 1 @@ -416,7 +416,7 @@ glabel L800EC054 /* B63284 800EC0E4 1000FF60 */ b .L800EBE68 /* B63288 800EC0E8 E644001C */ swc1 $f4, 0x1c($s2) glabel L800EC0EC -/* B6328C 800EC0EC 0C03A752 */ jal func_800E9D48 +/* B6328C 800EC0EC 0C03A752 */ jal Audio_M64ReadU8 /* B63290 800EC0F0 02202025 */ move $a0, $s1 /* B63294 800EC0F4 00026E00 */ sll $t5, $v0, 0x18 /* B63298 800EC0F8 000D7603 */ sra $t6, $t5, 0x18 @@ -428,20 +428,20 @@ glabel L800EC0EC /* B632B0 800EC110 1000FF55 */ b .L800EBE68 /* B632B4 800EC114 E652002C */ swc1 $f18, 0x2c($s2) glabel L800EC118 -/* B632B8 800EC118 0C03A757 */ jal func_800E9D5C +/* B632B8 800EC118 0C03A757 */ jal Audio_M64ReadS16 /* B632BC 800EC11C 02202025 */ move $a0, $s1 /* B632C0 800EC120 02402025 */ move $a0, $s2 -/* B632C4 800EC124 0C03A64D */ jal func_800E9934 +/* B632C4 800EC124 0C03A64D */ jal Audio_SequencePlayerInitChannels /* B632C8 800EC128 3045FFFF */ andi $a1, $v0, 0xffff /* B632CC 800EC12C 1000FF4E */ b .L800EBE68 /* B632D0 800EC130 00000000 */ nop glabel L800EC134 -/* B632D4 800EC134 0C03A757 */ jal func_800E9D5C +/* B632D4 800EC134 0C03A757 */ jal Audio_M64ReadS16 /* B632D8 800EC138 02202025 */ move $a0, $s1 /* B632DC 800EC13C 1000FF4A */ b .L800EBE68 /* B632E0 800EC140 00000000 */ nop glabel L800EC144 -/* B632E4 800EC144 0C03A752 */ jal func_800E9D48 +/* B632E4 800EC144 0C03A752 */ jal Audio_M64ReadU8 /* B632E8 800EC148 02202025 */ move $a0, $s1 /* B632EC 800EC14C 00027E00 */ sll $t7, $v0, 0x18 /* B632F0 800EC150 000FC603 */ sra $t8, $t7, 0x18 @@ -458,12 +458,12 @@ glabel L800EC170 /* B63318 800EC178 1000FF3B */ b .L800EBE68 /* B6331C 800EC17C A24A0000 */ sb $t2, ($s2) glabel L800EC180 -/* B63320 800EC180 0C03A752 */ jal func_800E9D48 +/* B63320 800EC180 0C03A752 */ jal Audio_M64ReadU8 /* B63324 800EC184 02202025 */ move $a0, $s1 /* B63328 800EC188 1000FF37 */ b .L800EBE68 /* B6332C 800EC18C A2420003 */ sb $v0, 3($s2) glabel L800EC190 -/* B63330 800EC190 0C03A757 */ jal func_800E9D5C +/* B63330 800EC190 0C03A757 */ jal Audio_M64ReadS16 /* B63334 800EC194 02202025 */ move $a0, $s1 /* B63338 800EC198 8E490018 */ lw $t1, 0x18($s2) /* B6333C 800EC19C 304BFFFF */ andi $t3, $v0, 0xffff @@ -476,22 +476,22 @@ glabel L800EC190 /* B63354 800EC1B4 1000FF2C */ b .L800EBE68 /* B63358 800EC1B8 AE430098 */ sw $v1, 0x98($s2) glabel L800EC1BC -/* B6335C 800EC1BC 0C03A752 */ jal func_800E9D48 +/* B6335C 800EC1BC 0C03A752 */ jal Audio_M64ReadU8 /* B63360 800EC1C0 02202025 */ move $a0, $s1 /* B63364 800EC1C4 1000FF28 */ b .L800EBE68 /* B63368 800EC1C8 A2420002 */ sb $v0, 2($s2) glabel L800EC1CC -/* B6336C 800EC1CC 0C03A752 */ jal func_800E9D48 +/* B6336C 800EC1CC 0C03A752 */ jal Audio_M64ReadU8 /* B63370 800EC1D0 02202025 */ move $a0, $s1 /* B63374 800EC1D4 14400006 */ bnez $v0, .L800EC1F0 -/* B63378 800EC1D8 3C0F8017 */ lui $t7, %hi(D_80171AFC) # $t7, 0x8017 -/* B6337C 800EC1DC 3C0C8017 */ lui $t4, %hi(D_80171AFC) # $t4, 0x8017 -/* B63380 800EC1E0 8D8C1AFC */ lw $t4, %lo(D_80171AFC)($t4) +/* B63378 800EC1D8 3C0F8017 */ lui $t7, %hi(gAudioContext+0x297c) # $t7, 0x8017 +/* B6337C 800EC1DC 3C0C8017 */ lui $t4, %hi(gAudioContext+0x297c) # $t4, 0x8017 +/* B63380 800EC1E0 8D8C1AFC */ lw $t4, %lo(gAudioContext+0x297c)($t4) /* B63384 800EC1E4 000C7082 */ srl $t6, $t4, 2 /* B63388 800EC1E8 1000FF1F */ b .L800EBE68 /* B6338C 800EC1EC A22E0019 */ sb $t6, 0x19($s1) .L800EC1F0: -/* B63390 800EC1F0 8DEF1AFC */ lw $t7, %lo(D_80171AFC)($t7) +/* B63390 800EC1F0 8DEF1AFC */ lw $t7, %lo(gAudioContext+0x297c)($t7) /* B63394 800EC1F4 305900FF */ andi $t9, $v0, 0xff /* B63398 800EC1F8 000FC082 */ srl $t8, $t7, 2 /* B6339C 800EC1FC 0319001B */ divu $zero, $t8, $t9 @@ -504,7 +504,7 @@ glabel L800EC1CC /* B633B4 800EC214 1000FF14 */ b .L800EBE68 /* B633B8 800EC218 00000000 */ nop glabel L800EC21C -/* B633BC 800EC21C 0C03A757 */ jal func_800E9D5C +/* B633BC 800EC21C 0C03A757 */ jal Audio_M64ReadS16 /* B633C0 800EC220 02202025 */ move $a0, $s1 /* B633C4 800EC224 82250019 */ lb $a1, 0x19($s1) /* B633C8 800EC228 2401FFFF */ li $at, -1 @@ -535,29 +535,29 @@ glabel L800EC21C /* B6342C 800EC28C 1000FEF6 */ b .L800EBE68 /* B63430 800EC290 AE2B0000 */ sw $t3, ($s1) glabel L800EC294 -/* B63434 800EC294 0C03A752 */ jal func_800E9D48 +/* B63434 800EC294 0C03A752 */ jal Audio_M64ReadU8 /* B63438 800EC298 02202025 */ move $a0, $s1 /* B6343C 800EC29C 1000FEF2 */ b .L800EBE68 /* B63440 800EC2A0 A2220019 */ sb $v0, 0x19($s1) glabel L800EC2A4 -/* B63444 800EC2A4 0C03A752 */ jal func_800E9D48 +/* B63444 800EC2A4 0C03A752 */ jal Audio_M64ReadU8 /* B63448 800EC2A8 02202025 */ move $a0, $s1 /* B6344C 800EC2AC 822E0019 */ lb $t6, 0x19($s1) /* B63450 800EC2B0 01C26824 */ and $t5, $t6, $v0 /* B63454 800EC2B4 1000FEEC */ b .L800EBE68 /* B63458 800EC2B8 A22D0019 */ sb $t5, 0x19($s1) glabel L800EC2BC -/* B6345C 800EC2BC 0C03A752 */ jal func_800E9D48 +/* B6345C 800EC2BC 0C03A752 */ jal Audio_M64ReadU8 /* B63460 800EC2C0 02202025 */ move $a0, $s1 /* B63464 800EC2C4 822F0019 */ lb $t7, 0x19($s1) /* B63468 800EC2C8 01E2C023 */ subu $t8, $t7, $v0 /* B6346C 800EC2CC 1000FEE6 */ b .L800EBE68 /* B63470 800EC2D0 A2380019 */ sb $t8, 0x19($s1) glabel L800EC2D4 -/* B63474 800EC2D4 0C03A752 */ jal func_800E9D48 +/* B63474 800EC2D4 0C03A752 */ jal Audio_M64ReadU8 /* B63478 800EC2D8 02202025 */ move $a0, $s1 /* B6347C 800EC2DC 305000FF */ andi $s0, $v0, 0xff -/* B63480 800EC2E0 0C03A757 */ jal func_800E9D5C +/* B63480 800EC2E0 0C03A757 */ jal Audio_M64ReadS16 /* B63484 800EC2E4 02202025 */ move $a0, $s1 /* B63488 800EC2E8 8E590018 */ lw $t9, 0x18($s2) /* B6348C 800EC2EC 92280019 */ lbu $t0, 0x19($s1) @@ -572,27 +572,27 @@ glabel L800EC304 /* B634AC 800EC30C 1000008F */ b .L800EC54C /* B634B0 800EC310 A24E0000 */ sb $t6, ($s2) glabel L800EC314 -/* B634B4 800EC314 0C03A757 */ jal func_800E9D5C +/* B634B4 800EC314 0C03A757 */ jal Audio_M64ReadS16 /* B634B8 800EC318 02202025 */ move $a0, $s1 /* B634BC 800EC31C 304DFFFF */ andi $t5, $v0, 0xffff /* B634C0 800EC320 1000FED1 */ b .L800EBE68 /* B634C4 800EC324 AE4D00E0 */ sw $t5, 0xe0($s2) glabel L800EC328 -/* B634C8 800EC328 0C03A757 */ jal func_800E9D5C +/* B634C8 800EC328 0C03A757 */ jal Audio_M64ReadS16 /* B634CC 800EC32C 02202025 */ move $a0, $s1 -/* B634D0 800EC330 0C03A752 */ jal func_800E9D48 +/* B634D0 800EC330 0C03A752 */ jal Audio_M64ReadU8 /* B634D4 800EC334 02202025 */ move $a0, $s1 /* B634D8 800EC338 1000FECB */ b .L800EBE68 /* B634DC 800EC33C 00000000 */ nop glabel L800EC340 -/* B634E0 800EC340 0C03A752 */ jal func_800E9D48 +/* B634E0 800EC340 0C03A752 */ jal Audio_M64ReadU8 /* B634E4 800EC344 02202025 */ move $a0, $s1 /* B634E8 800EC348 240100FF */ li $at, 255 /* B634EC 800EC34C 14410002 */ bne $v0, $at, .L800EC358 /* B634F0 800EC350 305000FF */ andi $s0, $v0, 0xff /* B634F4 800EC354 92500007 */ lbu $s0, 7($s2) .L800EC358: -/* B634F8 800EC358 0C03A752 */ jal func_800E9D48 +/* B634F8 800EC358 0C03A752 */ jal Audio_M64ReadU8 /* B634FC 800EC35C 02202025 */ move $a0, $s1 /* B63500 800EC360 02002025 */ move $a0, $s0 /* B63504 800EC364 00402825 */ move $a1, $v0 @@ -663,33 +663,33 @@ glabel L800EC438 /* B635EC 800EC44C 1000FE86 */ b .L800EBE68 /* B635F0 800EC450 00000000 */ nop glabel L800EC454 -/* B635F4 800EC454 0C03A757 */ jal func_800E9D5C +/* B635F4 800EC454 0C03A757 */ jal Audio_M64ReadS16 /* B635F8 800EC458 02202025 */ move $a0, $s1 /* B635FC 800EC45C 8E4A0018 */ lw $t2, 0x18($s2) /* B63600 800EC460 02002825 */ move $a1, $s0 /* B63604 800EC464 3049FFFF */ andi $t1, $v0, 0xffff /* B63608 800EC468 30A5000F */ andi $a1, $a1, 0xf /* B6360C 800EC46C 02402025 */ move $a0, $s2 -/* B63610 800EC470 0C03A6AB */ jal func_800E9AAC +/* B63610 800EC470 0C03A6AB */ jal Audio_SequenceChannelEnable /* B63614 800EC474 01493021 */ addu $a2, $t2, $t1 /* B63618 800EC478 1000FE7B */ b .L800EBE68 /* B6361C 800EC47C 00000000 */ nop glabel L800EC480 -/* B63620 800EC480 0C03A757 */ jal func_800E9D5C +/* B63620 800EC480 0C03A757 */ jal Audio_M64ReadS16 /* B63624 800EC484 02202025 */ move $a0, $s1 /* B63628 800EC488 8E280000 */ lw $t0, ($s1) /* B6362C 800EC48C 02002825 */ move $a1, $s0 /* B63630 800EC490 30A5000F */ andi $a1, $a1, 0xf /* B63634 800EC494 02402025 */ move $a0, $s2 -/* B63638 800EC498 0C03A6AB */ jal func_800E9AAC +/* B63638 800EC498 0C03A6AB */ jal Audio_SequenceChannelEnable /* B6363C 800EC49C 01023021 */ addu $a2, $t0, $v0 /* B63640 800EC4A0 1000FE71 */ b .L800EBE68 /* B63644 800EC4A4 00000000 */ nop glabel L800EC4A8 -/* B63648 800EC4A8 0C03A752 */ jal func_800E9D48 +/* B63648 800EC4A8 0C03A752 */ jal Audio_M64ReadU8 /* B6364C 800EC4AC 02202025 */ move $a0, $s1 /* B63650 800EC4B0 305000FF */ andi $s0, $v0, 0xff -/* B63654 800EC4B4 0C03A757 */ jal func_800E9D5C +/* B63654 800EC4B4 0C03A757 */ jal Audio_M64ReadS16 /* B63658 800EC4B8 02202025 */ move $a0, $s1 /* B6365C 800EC4BC 93AE0066 */ lbu $t6, 0x66($sp) /* B63660 800EC4C0 8E4C0018 */ lw $t4, 0x18($s2) @@ -702,10 +702,10 @@ glabel L800EC4A8 /* B6367C 800EC4DC 1000FE62 */ b .L800EBE68 /* B63680 800EC4E0 00000000 */ nop glabel L800EC4E4 -/* B63684 800EC4E4 0C03A752 */ jal func_800E9D48 +/* B63684 800EC4E4 0C03A752 */ jal Audio_M64ReadU8 /* B63688 800EC4E8 02202025 */ move $a0, $s1 /* B6368C 800EC4EC 00408025 */ move $s0, $v0 -/* B63690 800EC4F0 0C03A752 */ jal func_800E9D48 +/* B63690 800EC4F0 0C03A752 */ jal Audio_M64ReadU8 /* B63694 800EC4F4 02202025 */ move $a0, $s1 /* B63698 800EC4F8 93AF0066 */ lbu $t7, 0x66($sp) /* B6369C 800EC4FC 02002025 */ move $a0, $s0 @@ -726,7 +726,7 @@ glabel L800EC4E4 /* B636CC 800EC52C 00186FC2 */ srl $t5, $t8, 0x1f /* B636D0 800EC530 51A00004 */ beql $t5, $zero, .L800EC544 /* B636D4 800EC534 26100004 */ addiu $s0, $s0, 4 -/* B636D8 800EC538 0C03AC1A */ jal func_800EB068 +/* B636D8 800EC538 0C03AC1A */ jal Audio_SequenceChannelProcessScript /* B636DC 800EC53C 00000000 */ nop /* B636E0 800EC540 26100004 */ addiu $s0, $s0, 4 .L800EC544: diff --git a/asm/non_matchings/code/audio_seqplayer/func_800E9340.s b/asm/non_matchings/code/audio_seqplayer/func_800E9340.s deleted file mode 100644 index 26d1396803..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800E9340.s +++ /dev/null @@ -1,30 +0,0 @@ -glabel func_800E9340 -/* B604E0 800E9340 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B604E4 800E9344 AFA5001C */ sw $a1, 0x1c($sp) -/* B604E8 800E9348 30A500FF */ andi $a1, $a1, 0xff -/* B604EC 800E934C 3C028013 */ lui $v0, %hi(D_80130470) -/* B604F0 800E9350 00451021 */ addu $v0, $v0, $a1 -/* B604F4 800E9354 90420470 */ lbu $v0, %lo(D_80130470)($v0) -/* B604F8 800E9358 24010001 */ li $at, 1 -/* B604FC 800E935C AFBF0014 */ sw $ra, 0x14($sp) -/* B60500 800E9360 304F0003 */ andi $t7, $v0, 3 -/* B60504 800E9364 15E1000B */ bne $t7, $at, .L800E9394 -/* B60508 800E9368 00001825 */ move $v1, $zero -/* B6050C 800E936C 30580080 */ andi $t8, $v0, 0x80 -/* B60510 800E9370 17000005 */ bnez $t8, .L800E9388 -/* B60514 800E9374 00000000 */ nop -/* B60518 800E9378 0C03A752 */ jal func_800E9D48 -/* B6051C 800E937C 00000000 */ nop -/* B60520 800E9380 10000004 */ b .L800E9394 -/* B60524 800E9384 3043FFFF */ andi $v1, $v0, 0xffff -.L800E9388: -/* B60528 800E9388 0C03A757 */ jal func_800E9D5C -/* B6052C 800E938C 00000000 */ nop -/* B60530 800E9390 3043FFFF */ andi $v1, $v0, 0xffff -.L800E9394: -/* B60534 800E9394 8FBF0014 */ lw $ra, 0x14($sp) -/* B60538 800E9398 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6053C 800E939C 00601025 */ move $v0, $v1 -/* B60540 800E93A0 03E00008 */ jr $ra -/* B60544 800E93A4 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800E93A8.s b/asm/non_matchings/code/audio_seqplayer/func_800E93A8.s deleted file mode 100644 index 80d59be8f5..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800E93A8.s +++ /dev/null @@ -1,158 +0,0 @@ -.late_rodata -glabel jtbl_80149620 - .word L800E9530 - .word L800E9530 - .word L800E9530 - .word L800E94DC - .word L800E94CC - .word L800E9484 - .word L800E9454 - .word L800E94DC - .word L800E94DC - .word L800E94DC - .word L800E9420 - .word L800E9408 - .word L800E9418 - .word L800E93D8 - -.text -glabel func_800E93A8 -/* B60548 800E93A8 24CEFF0E */ addiu $t6, $a2, -0xf2 -/* B6054C 800E93AC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B60550 800E93B0 2DC1000E */ sltiu $at, $t6, 0xe -/* B60554 800E93B4 AFBF0014 */ sw $ra, 0x14($sp) -/* B60558 800E93B8 1020006D */ beqz $at, .L800E9570 -/* B6055C 800E93BC 00C01025 */ move $v0, $a2 -/* B60560 800E93C0 000E7080 */ sll $t6, $t6, 2 -/* B60564 800E93C4 3C018015 */ lui $at, %hi(jtbl_80149620) -/* B60568 800E93C8 002E0821 */ addu $at, $at, $t6 -/* B6056C 800E93CC 8C2E9620 */ lw $t6, %lo(jtbl_80149620)($at) -/* B60570 800E93D0 01C00008 */ jr $t6 -/* B60574 800E93D4 00000000 */ nop -glabel L800E93D8 -/* B60578 800E93D8 90A20018 */ lbu $v0, 0x18($a1) -/* B6057C 800E93DC 14400003 */ bnez $v0, .L800E93EC -/* B60580 800E93E0 2443FFFF */ addiu $v1, $v0, -1 -/* B60584 800E93E4 10000063 */ b .L800E9574 -/* B60588 800E93E8 2402FFFF */ li $v0, -1 -.L800E93EC: -/* B6058C 800E93EC 306300FF */ andi $v1, $v1, 0xff -/* B60590 800E93F0 00037880 */ sll $t7, $v1, 2 -/* B60594 800E93F4 00AFC021 */ addu $t8, $a1, $t7 -/* B60598 800E93F8 A0A30018 */ sb $v1, 0x18($a1) -/* B6059C 800E93FC 8F190004 */ lw $t9, 4($t8) -/* B605A0 800E9400 1000005B */ b .L800E9570 -/* B605A4 800E9404 ACB90000 */ sw $t9, ($a1) -glabel L800E9408 -/* B605A8 800E9408 0C03A765 */ jal func_800E9D94 -/* B605AC 800E940C 00A02025 */ move $a0, $a1 -/* B605B0 800E9410 10000059 */ b .L800E9578 -/* B605B4 800E9414 8FBF0014 */ lw $ra, 0x14($sp) -glabel L800E9418 -/* B605B8 800E9418 10000056 */ b .L800E9574 -/* B605BC 800E941C 24020001 */ li $v0, 1 -glabel L800E9420 -/* B605C0 800E9420 90A90018 */ lbu $t1, 0x18($a1) -/* B605C4 800E9424 8CA80000 */ lw $t0, ($a1) -/* B605C8 800E9428 30EFFFFF */ andi $t7, $a3, 0xffff -/* B605CC 800E942C 00095080 */ sll $t2, $t1, 2 -/* B605D0 800E9430 00AA5821 */ addu $t3, $a1, $t2 -/* B605D4 800E9434 AD680004 */ sw $t0, 4($t3) -/* B605D8 800E9438 90AC0018 */ lbu $t4, 0x18($a1) -/* B605DC 800E943C 258D0001 */ addiu $t5, $t4, 1 -/* B605E0 800E9440 A0AD0018 */ sb $t5, 0x18($a1) -/* B605E4 800E9444 8C8E0018 */ lw $t6, 0x18($a0) -/* B605E8 800E9448 01CFC021 */ addu $t8, $t6, $t7 -/* B605EC 800E944C 10000048 */ b .L800E9570 -/* B605F0 800E9450 ACB80000 */ sw $t8, ($a1) -glabel L800E9454 -/* B605F4 800E9454 90B90018 */ lbu $t9, 0x18($a1) -/* B605F8 800E9458 00B94821 */ addu $t1, $a1, $t9 -/* B605FC 800E945C A1270014 */ sb $a3, 0x14($t1) -/* B60600 800E9460 90A80018 */ lbu $t0, 0x18($a1) -/* B60604 800E9464 8CAA0000 */ lw $t2, ($a1) -/* B60608 800E9468 00085880 */ sll $t3, $t0, 2 -/* B6060C 800E946C 00AB6021 */ addu $t4, $a1, $t3 -/* B60610 800E9470 AD8A0004 */ sw $t2, 4($t4) -/* B60614 800E9474 90AD0018 */ lbu $t5, 0x18($a1) -/* B60618 800E9478 25AE0001 */ addiu $t6, $t5, 1 -/* B6061C 800E947C 1000003C */ b .L800E9570 -/* B60620 800E9480 A0AE0018 */ sb $t6, 0x18($a1) -glabel L800E9484 -/* B60624 800E9484 90AF0018 */ lbu $t7, 0x18($a1) -/* B60628 800E9488 00AF1821 */ addu $v1, $a1, $t7 -/* B6062C 800E948C 90780013 */ lbu $t8, 0x13($v1) -/* B60630 800E9490 2719FFFF */ addiu $t9, $t8, -1 -/* B60634 800E9494 A0790013 */ sb $t9, 0x13($v1) -/* B60638 800E9498 90A20018 */ lbu $v0, 0x18($a1) -/* B6063C 800E949C 00A24821 */ addu $t1, $a1, $v0 -/* B60640 800E94A0 91280013 */ lbu $t0, 0x13($t1) -/* B60644 800E94A4 00402025 */ move $a0, $v0 -/* B60648 800E94A8 00045880 */ sll $t3, $a0, 2 -/* B6064C 800E94AC 11000005 */ beqz $t0, .L800E94C4 -/* B60650 800E94B0 244DFFFF */ addiu $t5, $v0, -1 -/* B60654 800E94B4 00AB5021 */ addu $t2, $a1, $t3 -/* B60658 800E94B8 8D4C0000 */ lw $t4, ($t2) -/* B6065C 800E94BC 1000002C */ b .L800E9570 -/* B60660 800E94C0 ACAC0000 */ sw $t4, ($a1) -.L800E94C4: -/* B60664 800E94C4 1000002A */ b .L800E9570 -/* B60668 800E94C8 A0AD0018 */ sb $t5, 0x18($a1) -glabel L800E94CC -/* B6066C 800E94CC 90AE0018 */ lbu $t6, 0x18($a1) -/* B60670 800E94D0 25CFFFFF */ addiu $t7, $t6, -1 -/* B60674 800E94D4 10000026 */ b .L800E9570 -/* B60678 800E94D8 A0AF0018 */ sb $t7, 0x18($a1) -glabel L800E94DC -/* B6067C 800E94DC 240100FA */ li $at, 250 -/* B60680 800E94E0 54410004 */ bnel $v0, $at, .L800E94F4 -/* B60684 800E94E4 240100F9 */ li $at, 249 -/* B60688 800E94E8 80B80019 */ lb $t8, 0x19($a1) -/* B6068C 800E94EC 17000020 */ bnez $t8, .L800E9570 -/* B60690 800E94F0 240100F9 */ li $at, 249 -.L800E94F4: -/* B60694 800E94F4 54410004 */ bnel $v0, $at, .L800E9508 -/* B60698 800E94F8 240100F5 */ li $at, 245 -/* B6069C 800E94FC 80B90019 */ lb $t9, 0x19($a1) -/* B606A0 800E9500 0721001B */ bgez $t9, .L800E9570 -/* B606A4 800E9504 240100F5 */ li $at, 245 -.L800E9508: -/* B606A8 800E9508 54410005 */ bnel $v0, $at, .L800E9520 -/* B606AC 800E950C 8C880018 */ lw $t0, 0x18($a0) -/* B606B0 800E9510 80A90019 */ lb $t1, 0x19($a1) -/* B606B4 800E9514 05220017 */ bltzl $t1, .L800E9574 -/* B606B8 800E9518 00001025 */ move $v0, $zero -/* B606BC 800E951C 8C880018 */ lw $t0, 0x18($a0) -.L800E9520: -/* B606C0 800E9520 30EBFFFF */ andi $t3, $a3, 0xffff -/* B606C4 800E9524 010B5021 */ addu $t2, $t0, $t3 -/* B606C8 800E9528 10000011 */ b .L800E9570 -/* B606CC 800E952C ACAA0000 */ sw $t2, ($a1) -glabel L800E9530 -/* B606D0 800E9530 240100F3 */ li $at, 243 -/* B606D4 800E9534 54410004 */ bnel $v0, $at, .L800E9548 -/* B606D8 800E9538 240100F2 */ li $at, 242 -/* B606DC 800E953C 80AC0019 */ lb $t4, 0x19($a1) -/* B606E0 800E9540 1580000B */ bnez $t4, .L800E9570 -/* B606E4 800E9544 240100F2 */ li $at, 242 -.L800E9548: -/* B606E8 800E9548 54410005 */ bnel $v0, $at, .L800E9560 -/* B606EC 800E954C 8CAE0000 */ lw $t6, ($a1) -/* B606F0 800E9550 80AD0019 */ lb $t5, 0x19($a1) -/* B606F4 800E9554 05A30007 */ bgezl $t5, .L800E9574 -/* B606F8 800E9558 00001025 */ move $v0, $zero -/* B606FC 800E955C 8CAE0000 */ lw $t6, ($a1) -.L800E9560: -/* B60700 800E9560 0007C600 */ sll $t8, $a3, 0x18 -/* B60704 800E9564 0018CE03 */ sra $t9, $t8, 0x18 -/* B60708 800E9568 01D94821 */ addu $t1, $t6, $t9 -/* B6070C 800E956C ACA90000 */ sw $t1, ($a1) -.L800E9570: -/* B60710 800E9570 00001025 */ move $v0, $zero -.L800E9574: -/* B60714 800E9574 8FBF0014 */ lw $ra, 0x14($sp) -.L800E9578: -/* B60718 800E9578 27BD0018 */ addiu $sp, $sp, 0x18 -/* B6071C 800E957C 03E00008 */ jr $ra -/* B60720 800E9580 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800E9584.s b/asm/non_matchings/code/audio_seqplayer/func_800E9584.s deleted file mode 100644 index 04e120c4a3..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800E9584.s +++ /dev/null @@ -1,89 +0,0 @@ -glabel func_800E9584 -/* B60724 800E9584 3C0E8017 */ lui $t6, %hi(gAudioContext) # $t6, 0x8017 -/* B60728 800E9588 25CEF180 */ addiu $t6, %lo(gAudioContext) # addiu $t6, $t6, -0xe80 -/* B6072C 800E958C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B60730 800E9590 25CF5AB0 */ addiu $t7, $t6, 0x5ab0 -/* B60734 800E9594 AFBF0014 */ sw $ra, 0x14($sp) -/* B60738 800E9598 108F004B */ beq $a0, $t7, .L800E96C8 -/* B6073C 800E959C 00802825 */ move $a1, $a0 -/* B60740 800E95A0 90980000 */ lbu $t8, ($a0) -/* B60744 800E95A4 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B60748 800E95A8 44810000 */ mtc1 $at, $f0 -/* B6074C 800E95AC 3308FF7F */ andi $t0, $t8, 0xff7f -/* B60750 800E95B0 310A00BF */ andi $t2, $t0, 0xbf -/* B60754 800E95B4 A0880000 */ sb $t0, ($a0) -/* B60758 800E95B8 314C00DF */ andi $t4, $t2, 0xdf -/* B6075C 800E95BC A08A0000 */ sb $t2, ($a0) -/* B60760 800E95C0 318E00EF */ andi $t6, $t4, 0xef -/* B60764 800E95C4 A08C0000 */ sb $t4, ($a0) -/* B60768 800E95C8 31D800F7 */ andi $t8, $t6, 0xf7 -/* B6076C 800E95CC A08E0000 */ sb $t6, ($a0) -/* B60770 800E95D0 330800FB */ andi $t0, $t8, 0xfb -/* B60774 800E95D4 A0980000 */ sb $t8, ($a0) -/* B60778 800E95D8 24020800 */ li $v0, 2048 -/* B6077C 800E95DC 3C0F8013 */ lui $t7, %hi(D_8012FAD4) # $t7, 0x8013 -/* B60780 800E95E0 A0880000 */ sb $t0, ($a0) -/* B60784 800E95E4 310900FD */ andi $t1, $t0, 0xfd -/* B60788 800E95E8 240A00FF */ li $t2, 255 -/* B6078C 800E95EC 240B0040 */ li $t3, 64 -/* B60790 800E95F0 240C0080 */ li $t4, 128 -/* B60794 800E95F4 240D0003 */ li $t5, 3 -/* B60798 800E95F8 240E0001 */ li $t6, 1 -/* B6079C 800E95FC 25EFFAD4 */ addiu $t7, %lo(D_8012FAD4) # addiu $t7, $t7, -0x52c -/* B607A0 800E9600 241800F0 */ li $t8, 240 -/* B607A4 800E9604 A4820014 */ sh $v0, 0x14($a0) -/* B607A8 800E9608 A4820010 */ sh $v0, 0x10($a0) -/* B607AC 800E960C A4800026 */ sh $zero, 0x26($a0) -/* B607B0 800E9610 A0890000 */ sb $t1, ($a0) -/* B607B4 800E9614 A0800009 */ sb $zero, 9($a0) -/* B607B8 800E9618 A08000D0 */ sb $zero, 0xd0($a0) -/* B607BC 800E961C A08A0001 */ sb $t2, 1($a0) -/* B607C0 800E9620 A0800078 */ sb $zero, 0x78($a0) -/* B607C4 800E9624 A08B000A */ sb $t3, 0xa($a0) -/* B607C8 800E9628 A08C000B */ sb $t4, 0xb($a0) -/* B607CC 800E962C A080000D */ sb $zero, 0xd($a0) -/* B607D0 800E9630 A080000E */ sb $zero, 0xe($a0) -/* B607D4 800E9634 AC800040 */ sw $zero, 0x40($a0) -/* B607D8 800E9638 A0800008 */ sb $zero, 8($a0) -/* B607DC 800E963C A0800004 */ sb $zero, 4($a0) -/* B607E0 800E9640 A080000C */ sb $zero, 0xc($a0) -/* B607E4 800E9644 A08D0005 */ sb $t5, 5($a0) -/* B607E8 800E9648 A08E0006 */ sb $t6, 6($a0) -/* B607EC 800E964C A480001E */ sh $zero, 0x1e($a0) -/* B607F0 800E9650 AC8F0080 */ sw $t7, 0x80($a0) -/* B607F4 800E9654 A098007C */ sb $t8, 0x7c($a0) -/* B607F8 800E9658 A080007D */ sb $zero, 0x7d($a0) -/* B607FC 800E965C A4800016 */ sh $zero, 0x16($a0) -/* B60800 800E9660 A4800012 */ sh $zero, 0x12($a0) -/* B60804 800E9664 A4800018 */ sh $zero, 0x18($a0) -/* B60808 800E9668 A480001A */ sh $zero, 0x1a($a0) -/* B6080C 800E966C A480001C */ sh $zero, 0x1c($a0) -/* B60810 800E9670 AC8000CC */ sw $zero, 0xcc($a0) -/* B60814 800E9674 A4800020 */ sh $zero, 0x20($a0) -/* B60818 800E9678 A080000F */ sb $zero, 0xf($a0) -/* B6081C 800E967C E480002C */ swc1 $f0, 0x2c($a0) -/* B60820 800E9680 E4800028 */ swc1 $f0, 0x28($a0) -/* B60824 800E9684 E4800038 */ swc1 $f0, 0x38($a0) -/* B60828 800E9688 00002025 */ move $a0, $zero -/* B6082C 800E968C 2402FFFF */ li $v0, -1 -/* B60830 800E9690 00A01825 */ move $v1, $a1 -/* B60834 800E9694 24060008 */ li $a2, 8 -.L800E9698: -/* B60838 800E9698 24840004 */ addiu $a0, $a0, 4 -/* B6083C 800E969C A06200C5 */ sb $v0, 0xc5($v1) -/* B60840 800E96A0 A06200C6 */ sb $v0, 0xc6($v1) -/* B60844 800E96A4 A06200C7 */ sb $v0, 0xc7($v1) -/* B60848 800E96A8 24630004 */ addiu $v1, $v1, 4 -/* B6084C 800E96AC 1486FFFA */ bne $a0, $a2, .L800E9698 -/* B60850 800E96B0 A06200C0 */ sb $v0, 0xc0($v1) -/* B60854 800E96B4 90B90000 */ lbu $t9, ($a1) -/* B60858 800E96B8 24A40084 */ addiu $a0, $a1, 0x84 -/* B6085C 800E96BC 3328FFFE */ andi $t0, $t9, 0xfffe -/* B60860 800E96C0 0C039F43 */ jal Audio_InitNoteLists -/* B60864 800E96C4 A0A80000 */ sb $t0, ($a1) -.L800E96C8: -/* B60868 800E96C8 8FBF0014 */ lw $ra, 0x14($sp) -/* B6086C 800E96CC 27BD0018 */ addiu $sp, $sp, 0x18 -/* B60870 800E96D0 03E00008 */ jr $ra -/* B60874 800E96D4 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800E96D8.s b/asm/non_matchings/code/audio_seqplayer/func_800E96D8.s deleted file mode 100644 index 520d9fb3f0..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800E96D8.s +++ /dev/null @@ -1,78 +0,0 @@ -glabel func_800E96D8 -/* B60878 800E96D8 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B6087C 800E96DC 00057880 */ sll $t7, $a1, 2 -/* B60880 800E96E0 AFBF0014 */ sw $ra, 0x14($sp) -/* B60884 800E96E4 AFA40028 */ sw $a0, 0x28($sp) -/* B60888 800E96E8 008F3021 */ addu $a2, $a0, $t7 -/* B6088C 800E96EC 8CC70050 */ lw $a3, 0x50($a2) -/* B60890 800E96F0 14E0000B */ bnez $a3, .L800E9720 -/* B60894 800E96F4 00E02025 */ move $a0, $a3 -/* B60898 800E96F8 3C048017 */ lui $a0, %hi(D_80174D08) -/* B6089C 800E96FC 24844D08 */ addiu $a0, %lo(D_80174D08) # addiu $a0, $a0, 0x4d08 -/* B608A0 800E9700 0C03A71A */ jal Audio_AudioListPopBack -/* B608A4 800E9704 AFA6001C */ sw $a2, 0x1c($sp) -/* B608A8 800E9708 8FA6001C */ lw $a2, 0x1c($sp) -/* B608AC 800E970C 14400007 */ bnez $v0, .L800E972C -/* B608B0 800E9710 ACC20050 */ sw $v0, 0x50($a2) -/* B608B4 800E9714 ACC00050 */ sw $zero, 0x50($a2) -/* B608B8 800E9718 10000034 */ b .L800E97EC -/* B608BC 800E971C 2402FFFF */ li $v0, -1 -.L800E9720: -/* B608C0 800E9720 0C039ED8 */ jal Audio_SeqChanLayerNoteDecay -/* B608C4 800E9724 AFA6001C */ sw $a2, 0x1c($sp) -/* B608C8 800E9728 8FA6001C */ lw $a2, 0x1c($sp) -.L800E972C: -/* B608CC 800E972C 8CC30050 */ lw $v1, 0x50($a2) -/* B608D0 800E9730 8FB80028 */ lw $t8, 0x28($sp) -/* B608D4 800E9734 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B608D8 800E9738 906B0000 */ lbu $t3, ($v1) -/* B608DC 800E973C AC780050 */ sw $t8, 0x50($v1) -/* B608E0 800E9740 8FB90028 */ lw $t9, 0x28($sp) -/* B608E4 800E9744 356D0080 */ ori $t5, $t3, 0x80 -/* B608E8 800E9748 31AF00BF */ andi $t7, $t5, 0xbf -/* B608EC 800E974C 8F29007C */ lw $t1, 0x7c($t9) -/* B608F0 800E9750 44810000 */ mtc1 $at, $f0 -/* B608F4 800E9754 44802000 */ mtc1 $zero, $f4 -/* B608F8 800E9758 AC690018 */ sw $t1, 0x18($v1) -/* B608FC 800E975C 8F280080 */ lw $t0, 0x80($t9) -/* B60900 800E9760 31F900DF */ andi $t9, $t7, 0xdf -/* B60904 800E9764 A06D0000 */ sb $t5, ($v1) -/* B60908 800E9768 332900EF */ andi $t1, $t9, 0xef -/* B6090C 800E976C A06F0000 */ sb $t7, ($v1) -/* B60910 800E9770 312B00F7 */ andi $t3, $t1, 0xf7 -/* B60914 800E9774 A0790000 */ sb $t9, ($v1) -/* B60918 800E9778 316D00FB */ andi $t5, $t3, 0xfb -/* B6091C 800E977C A0690000 */ sb $t1, ($v1) -/* B60920 800E9780 31AF00FD */ andi $t7, $t5, 0xfd -/* B60924 800E9784 A06B0000 */ sb $t3, ($v1) -/* B60928 800E9788 A06D0000 */ sb $t5, ($v1) -/* B6092C 800E978C AC68001C */ sw $t0, 0x1c($v1) -/* B60930 800E9790 31F800FE */ andi $t8, $t7, 0xfe -/* B60934 800E9794 24190080 */ li $t9, 128 -/* B60938 800E9798 24080040 */ li $t0, 64 -/* B6093C 800E979C 240900FF */ li $t1, 255 -/* B60940 800E97A0 A06F0000 */ sb $t7, ($v1) -/* B60944 800E97A4 00001025 */ move $v0, $zero -/* B60948 800E97A8 A0600018 */ sb $zero, 0x18($v1) -/* B6094C 800E97AC A0780000 */ sb $t8, ($v1) -/* B60950 800E97B0 A0600001 */ sb $zero, 1($v1) -/* B60954 800E97B4 A0600020 */ sb $zero, 0x20($v1) -/* B60958 800E97B8 A060006C */ sb $zero, 0x6c($v1) -/* B6095C 800E97BC A0790003 */ sb $t9, 3($v1) -/* B60960 800E97C0 A0680006 */ sb $t0, 6($v1) -/* B60964 800E97C4 A4600010 */ sh $zero, 0x10($v1) -/* B60968 800E97C8 A4600008 */ sh $zero, 8($v1) -/* B6096C 800E97CC A460000A */ sh $zero, 0xa($v1) -/* B60970 800E97D0 A460000C */ sh $zero, 0xc($v1) -/* B60974 800E97D4 AC60002C */ sw $zero, 0x2c($v1) -/* B60978 800E97D8 AC600048 */ sw $zero, 0x48($v1) -/* B6097C 800E97DC A0690002 */ sb $t1, 2($v1) -/* B60980 800E97E0 E4600030 */ swc1 $f0, 0x30($v1) -/* B60984 800E97E4 E4600034 */ swc1 $f0, 0x34($v1) -/* B60988 800E97E8 E4640038 */ swc1 $f4, 0x38($v1) -.L800E97EC: -/* B6098C 800E97EC 8FBF0014 */ lw $ra, 0x14($sp) -/* B60990 800E97F0 27BD0028 */ addiu $sp, $sp, 0x28 -/* B60994 800E97F4 03E00008 */ jr $ra -/* B60998 800E97F8 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800E97FC.s b/asm/non_matchings/code/audio_seqplayer/func_800E97FC.s deleted file mode 100644 index bdd4a23d0d..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800E97FC.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_800E97FC -/* B6099C 800E97FC 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B609A0 800E9800 10800019 */ beqz $a0, .L800E9868 -/* B609A4 800E9804 AFBF0014 */ sw $ra, 0x14($sp) -/* B609A8 800E9808 8C820050 */ lw $v0, 0x50($a0) -/* B609AC 800E980C 3C0E8017 */ lui $t6, %hi(D_80174C30) # $t6, 0x8017 -/* B609B0 800E9810 25CE4C30 */ addiu $t6, %lo(D_80174C30) # addiu $t6, $t6, 0x4c30 -/* B609B4 800E9814 11C2000C */ beq $t6, $v0, .L800E9848 -/* B609B8 800E9818 00000000 */ nop -/* B609BC 800E981C 8C4F004C */ lw $t7, 0x4c($v0) -/* B609C0 800E9820 24010001 */ li $at, 1 -/* B609C4 800E9824 8DF80000 */ lw $t8, ($t7) -/* B609C8 800E9828 0018C840 */ sll $t9, $t8, 1 -/* B609CC 800E982C 001947C2 */ srl $t0, $t9, 0x1f -/* B609D0 800E9830 15010005 */ bne $t0, $at, .L800E9848 -/* B609D4 800E9834 00000000 */ nop -/* B609D8 800E9838 0C039EE0 */ jal Audio_SeqChanLayerNoteRelease -/* B609DC 800E983C AFA40018 */ sw $a0, 0x18($sp) -/* B609E0 800E9840 10000004 */ b .L800E9854 -/* B609E4 800E9844 8FA40018 */ lw $a0, 0x18($sp) -.L800E9848: -/* B609E8 800E9848 0C039ED8 */ jal Audio_SeqChanLayerNoteDecay -/* B609EC 800E984C AFA40018 */ sw $a0, 0x18($sp) -/* B609F0 800E9850 8FA40018 */ lw $a0, 0x18($sp) -.L800E9854: -/* B609F4 800E9854 90890000 */ lbu $t1, ($a0) -/* B609F8 800E9858 312CFF7F */ andi $t4, $t1, 0xff7f -/* B609FC 800E985C A08C0000 */ sb $t4, ($a0) -/* B60A00 800E9860 358D0040 */ ori $t5, $t4, 0x40 -/* B60A04 800E9864 A08D0000 */ sb $t5, ($a0) -.L800E9868: -/* B60A08 800E9868 8FBF0014 */ lw $ra, 0x14($sp) -/* B60A0C 800E986C 27BD0018 */ addiu $sp, $sp, 0x18 -/* B60A10 800E9870 03E00008 */ jr $ra -/* B60A14 800E9874 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800E9878.s b/asm/non_matchings/code/audio_seqplayer/func_800E9878.s deleted file mode 100644 index 0bb16aa92b..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800E9878.s +++ /dev/null @@ -1,23 +0,0 @@ -glabel func_800E9878 -/* B60A18 800E9878 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B60A1C 800E987C 00057080 */ sll $t6, $a1, 2 -/* B60A20 800E9880 AFBF0014 */ sw $ra, 0x14($sp) -/* B60A24 800E9884 008E1021 */ addu $v0, $a0, $t6 -/* B60A28 800E9888 8C460050 */ lw $a2, 0x50($v0) -/* B60A2C 800E988C 3C048017 */ lui $a0, %hi(D_80174D08) # $a0, 0x8017 -/* B60A30 800E9890 24844D08 */ addiu $a0, %lo(D_80174D08) # addiu $a0, $a0, 0x4d08 -/* B60A34 800E9894 10C00008 */ beqz $a2, .L800E98B8 -/* B60A38 800E9898 24C50070 */ addiu $a1, $a2, 0x70 -/* B60A3C 800E989C AFA20018 */ sw $v0, 0x18($sp) -/* B60A40 800E98A0 0C03A70A */ jal Audio_AudioListPushBack -/* B60A44 800E98A4 AFA6001C */ sw $a2, 0x1c($sp) -/* B60A48 800E98A8 0C03A5FF */ jal func_800E97FC -/* B60A4C 800E98AC 8FA4001C */ lw $a0, 0x1c($sp) -/* B60A50 800E98B0 8FA20018 */ lw $v0, 0x18($sp) -/* B60A54 800E98B4 AC400050 */ sw $zero, 0x50($v0) -.L800E98B8: -/* B60A58 800E98B8 8FBF0014 */ lw $ra, 0x14($sp) -/* B60A5C 800E98BC 27BD0020 */ addiu $sp, $sp, 0x20 -/* B60A60 800E98C0 03E00008 */ jr $ra -/* B60A64 800E98C4 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800E9934.s b/asm/non_matchings/code/audio_seqplayer/func_800E9934.s deleted file mode 100644 index 3380297458..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800E9934.s +++ /dev/null @@ -1,69 +0,0 @@ -glabel func_800E9934 -/* B60AD4 800E9934 AFA50004 */ sw $a1, 4($sp) -/* B60AD8 800E9938 30A5FFFF */ andi $a1, $a1, 0xffff -/* B60ADC 800E993C 00803025 */ move $a2, $a0 -/* B60AE0 800E9940 00001025 */ move $v0, $zero -/* B60AE4 800E9944 24070010 */ li $a3, 16 -.L800E9948: -/* B60AE8 800E9948 30AE0001 */ andi $t6, $a1, 1 -/* B60AEC 800E994C 11C0000A */ beqz $t6, .L800E9978 -/* B60AF0 800E9950 00A01825 */ move $v1, $a1 -/* B60AF4 800E9954 00027880 */ sll $t7, $v0, 2 -/* B60AF8 800E9958 00CFC021 */ addu $t8, $a2, $t7 -/* B60AFC 800E995C 8F040038 */ lw $a0, 0x38($t8) -/* B60B00 800E9960 90D90005 */ lbu $t9, 5($a2) -/* B60B04 800E9964 A0990007 */ sb $t9, 7($a0) -/* B60B08 800E9968 90C80003 */ lbu $t0, 3($a2) -/* B60B0C 800E996C A0880003 */ sb $t0, 3($a0) -/* B60B10 800E9970 90C90002 */ lbu $t1, 2($a2) -/* B60B14 800E9974 A0890002 */ sb $t1, 2($a0) -.L800E9978: -/* B60B18 800E9978 00032843 */ sra $a1, $v1, 1 -/* B60B1C 800E997C 30A3FFFF */ andi $v1, $a1, 0xffff -/* B60B20 800E9980 306A0001 */ andi $t2, $v1, 1 -/* B60B24 800E9984 1140000A */ beqz $t2, .L800E99B0 -/* B60B28 800E9988 00032843 */ sra $a1, $v1, 1 -/* B60B2C 800E998C 00025880 */ sll $t3, $v0, 2 -/* B60B30 800E9990 00CB6021 */ addu $t4, $a2, $t3 -/* B60B34 800E9994 8D84003C */ lw $a0, 0x3c($t4) -/* B60B38 800E9998 90CD0005 */ lbu $t5, 5($a2) -/* B60B3C 800E999C A08D0007 */ sb $t5, 7($a0) -/* B60B40 800E99A0 90CE0003 */ lbu $t6, 3($a2) -/* B60B44 800E99A4 A08E0003 */ sb $t6, 3($a0) -/* B60B48 800E99A8 90CF0002 */ lbu $t7, 2($a2) -/* B60B4C 800E99AC A08F0002 */ sb $t7, 2($a0) -.L800E99B0: -/* B60B50 800E99B0 30A3FFFF */ andi $v1, $a1, 0xffff -/* B60B54 800E99B4 30780001 */ andi $t8, $v1, 1 -/* B60B58 800E99B8 1300000A */ beqz $t8, .L800E99E4 -/* B60B5C 800E99BC 00032843 */ sra $a1, $v1, 1 -/* B60B60 800E99C0 0002C880 */ sll $t9, $v0, 2 -/* B60B64 800E99C4 00D94021 */ addu $t0, $a2, $t9 -/* B60B68 800E99C8 8D040040 */ lw $a0, 0x40($t0) -/* B60B6C 800E99CC 90C90005 */ lbu $t1, 5($a2) -/* B60B70 800E99D0 A0890007 */ sb $t1, 7($a0) -/* B60B74 800E99D4 90CA0003 */ lbu $t2, 3($a2) -/* B60B78 800E99D8 A08A0003 */ sb $t2, 3($a0) -/* B60B7C 800E99DC 90CB0002 */ lbu $t3, 2($a2) -/* B60B80 800E99E0 A08B0002 */ sb $t3, 2($a0) -.L800E99E4: -/* B60B84 800E99E4 30A3FFFF */ andi $v1, $a1, 0xffff -/* B60B88 800E99E8 306C0001 */ andi $t4, $v1, 1 -/* B60B8C 800E99EC 1180000A */ beqz $t4, .L800E9A18 -/* B60B90 800E99F0 00032843 */ sra $a1, $v1, 1 -/* B60B94 800E99F4 00026880 */ sll $t5, $v0, 2 -/* B60B98 800E99F8 00CD7021 */ addu $t6, $a2, $t5 -/* B60B9C 800E99FC 8DC40044 */ lw $a0, 0x44($t6) -/* B60BA0 800E9A00 90CF0005 */ lbu $t7, 5($a2) -/* B60BA4 800E9A04 A08F0007 */ sb $t7, 7($a0) -/* B60BA8 800E9A08 90D80003 */ lbu $t8, 3($a2) -/* B60BAC 800E9A0C A0980003 */ sb $t8, 3($a0) -/* B60BB0 800E9A10 90D90002 */ lbu $t9, 2($a2) -/* B60BB4 800E9A14 A0990002 */ sb $t9, 2($a0) -.L800E9A18: -/* B60BB8 800E9A18 24420004 */ addiu $v0, $v0, 4 -/* B60BBC 800E9A1C 1447FFCA */ bne $v0, $a3, .L800E9948 -/* B60BC0 800E9A20 30A5FFFF */ andi $a1, $a1, 0xffff -/* B60BC4 800E9A24 03E00008 */ jr $ra -/* B60BC8 800E9A28 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800E9A2C.s b/asm/non_matchings/code/audio_seqplayer/func_800E9A2C.s deleted file mode 100644 index d7a2be5658..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800E9A2C.s +++ /dev/null @@ -1,36 +0,0 @@ -glabel func_800E9A2C -/* B60BCC 800E9A2C 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B60BD0 800E9A30 AFB20020 */ sw $s2, 0x20($sp) -/* B60BD4 800E9A34 AFB40028 */ sw $s4, 0x28($sp) -/* B60BD8 800E9A38 AFB30024 */ sw $s3, 0x24($sp) -/* B60BDC 800E9A3C AFB1001C */ sw $s1, 0x1c($sp) -/* B60BE0 800E9A40 AFB00018 */ sw $s0, 0x18($sp) -/* B60BE4 800E9A44 3C128017 */ lui $s2, %hi(D_80174C30) # $s2, 0x8017 -/* B60BE8 800E9A48 AFBF002C */ sw $ra, 0x2c($sp) -/* B60BEC 800E9A4C AFA50034 */ sw $a1, 0x34($sp) -/* B60BF0 800E9A50 26524C30 */ addiu $s2, %lo(D_80174C30) # addiu $s2, $s2, 0x4c30 -/* B60BF4 800E9A54 00008025 */ move $s0, $zero -/* B60BF8 800E9A58 00808825 */ move $s1, $a0 -/* B60BFC 800E9A5C 24130001 */ li $s3, 1 -/* B60C00 800E9A60 24140040 */ li $s4, 64 -.L800E9A64: -/* B60C04 800E9A64 8E240038 */ lw $a0, 0x38($s1) -/* B60C08 800E9A68 00927026 */ xor $t6, $a0, $s2 -/* B60C0C 800E9A6C 000E702B */ sltu $t6, $zero, $t6 -/* B60C10 800E9A70 566E0004 */ bnel $s3, $t6, .L800E9A84 -/* B60C14 800E9A74 26100004 */ addiu $s0, $s0, 4 -/* B60C18 800E9A78 0C03A632 */ jal Audio_SequenceChannelDisable -/* B60C1C 800E9A7C 00000000 */ nop -/* B60C20 800E9A80 26100004 */ addiu $s0, $s0, 4 -.L800E9A84: -/* B60C24 800E9A84 1614FFF7 */ bne $s0, $s4, .L800E9A64 -/* B60C28 800E9A88 26310004 */ addiu $s1, $s1, 4 -/* B60C2C 800E9A8C 8FBF002C */ lw $ra, 0x2c($sp) -/* B60C30 800E9A90 8FB00018 */ lw $s0, 0x18($sp) -/* B60C34 800E9A94 8FB1001C */ lw $s1, 0x1c($sp) -/* B60C38 800E9A98 8FB20020 */ lw $s2, 0x20($sp) -/* B60C3C 800E9A9C 8FB30024 */ lw $s3, 0x24($sp) -/* B60C40 800E9AA0 8FB40028 */ lw $s4, 0x28($sp) -/* B60C44 800E9AA4 03E00008 */ jr $ra -/* B60C48 800E9AA8 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800E9AAC.s b/asm/non_matchings/code/audio_seqplayer/func_800E9AAC.s deleted file mode 100644 index e0fc347516..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800E9AAC.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_800E9AAC -/* B60C4C 800E9AAC 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B60C50 800E9AB0 AFA5002C */ sw $a1, 0x2c($sp) -/* B60C54 800E9AB4 30A500FF */ andi $a1, $a1, 0xff -/* B60C58 800E9AB8 00057080 */ sll $t6, $a1, 2 -/* B60C5C 800E9ABC AFBF0024 */ sw $ra, 0x24($sp) -/* B60C60 800E9AC0 AFB30020 */ sw $s3, 0x20($sp) -/* B60C64 800E9AC4 AFB2001C */ sw $s2, 0x1c($sp) -/* B60C68 800E9AC8 AFB10018 */ sw $s1, 0x18($sp) -/* B60C6C 800E9ACC AFB00014 */ sw $s0, 0x14($sp) -/* B60C70 800E9AD0 008E7821 */ addu $t7, $a0, $t6 -/* B60C74 800E9AD4 8DF20038 */ lw $s2, 0x38($t7) -/* B60C78 800E9AD8 00008025 */ move $s0, $zero -/* B60C7C 800E9ADC 24130004 */ li $s3, 4 -/* B60C80 800E9AE0 92590000 */ lbu $t9, ($s2) -/* B60C84 800E9AE4 A2400078 */ sb $zero, 0x78($s2) -/* B60C88 800E9AE8 AE460060 */ sw $a2, 0x60($s2) -/* B60C8C 800E9AEC 37290080 */ ori $t1, $t9, 0x80 -/* B60C90 800E9AF0 312A00BF */ andi $t2, $t1, 0xbf -/* B60C94 800E9AF4 A2490000 */ sb $t1, ($s2) -/* B60C98 800E9AF8 A24A0000 */ sb $t2, ($s2) -/* B60C9C 800E9AFC A640001E */ sh $zero, 0x1e($s2) -/* B60CA0 800E9B00 02408825 */ move $s1, $s2 -.L800E9B04: -/* B60CA4 800E9B04 8E2B0050 */ lw $t3, 0x50($s1) -/* B60CA8 800E9B08 02402025 */ move $a0, $s2 -/* B60CAC 800E9B0C 51600004 */ beql $t3, $zero, .L800E9B20 -/* B60CB0 800E9B10 26100001 */ addiu $s0, $s0, 1 -/* B60CB4 800E9B14 0C03A61E */ jal func_800E9878 -/* B60CB8 800E9B18 02002825 */ move $a1, $s0 -/* B60CBC 800E9B1C 26100001 */ addiu $s0, $s0, 1 -.L800E9B20: -/* B60CC0 800E9B20 1613FFF8 */ bne $s0, $s3, .L800E9B04 -/* B60CC4 800E9B24 26310004 */ addiu $s1, $s1, 4 -/* B60CC8 800E9B28 8FBF0024 */ lw $ra, 0x24($sp) -/* B60CCC 800E9B2C 8FB00014 */ lw $s0, 0x14($sp) -/* B60CD0 800E9B30 8FB10018 */ lw $s1, 0x18($sp) -/* B60CD4 800E9B34 8FB2001C */ lw $s2, 0x1c($sp) -/* B60CD8 800E9B38 8FB30020 */ lw $s3, 0x20($sp) -/* B60CDC 800E9B3C 03E00008 */ jr $ra -/* B60CE0 800E9B40 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800E9B44.s b/asm/non_matchings/code/audio_seqplayer/func_800E9B44.s deleted file mode 100644 index 8f6e40b4e4..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800E9B44.s +++ /dev/null @@ -1,12 +0,0 @@ -glabel func_800E9B44 -/* B60CE4 800E9B44 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B60CE8 800E9B48 AFBF0014 */ sw $ra, 0x14($sp) -/* B60CEC 800E9B4C 908F0000 */ lbu $t7, ($a0) -/* B60CF0 800E9B50 35F80040 */ ori $t8, $t7, 0x40 -/* B60CF4 800E9B54 0C03A6DB */ jal Audio_SequencePlayerDisable -/* B60CF8 800E9B58 A0980000 */ sb $t8, ($a0) -/* B60CFC 800E9B5C 8FBF0014 */ lw $ra, 0x14($sp) -/* B60D00 800E9B60 27BD0018 */ addiu $sp, $sp, 0x18 -/* B60D04 800E9B64 03E00008 */ jr $ra -/* B60D08 800E9B68 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800E9CA8.s b/asm/non_matchings/code/audio_seqplayer/func_800E9CA8.s deleted file mode 100644 index 192506c1e8..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800E9CA8.s +++ /dev/null @@ -1,43 +0,0 @@ -glabel func_800E9CA8 -/* B60E48 800E9CA8 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B60E4C 800E9CAC 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 -/* B60E50 800E9CB0 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 -/* B60E54 800E9CB4 AFB30024 */ sw $s3, 0x24($sp) -/* B60E58 800E9CB8 3C138017 */ lui $s3, %hi(D_80174D08) # $s3, 0x8017 -/* B60E5C 800E9CBC 26734D08 */ addiu $s3, %lo(D_80174D08) # addiu $s3, $s3, 0x4d08 -/* B60E60 800E9CC0 AFB40028 */ sw $s4, 0x28($sp) -/* B60E64 800E9CC4 AFB20020 */ sw $s2, 0x20($sp) -/* B60E68 800E9CC8 AFB1001C */ sw $s1, 0x1c($sp) -/* B60E6C 800E9CCC AFB00018 */ sw $s0, 0x18($sp) -/* B60E70 800E9CD0 3C108017 */ lui $s0, %hi(gAudioContext) # $s0, 0x8017 -/* B60E74 800E9CD4 3C118017 */ lui $s1, %hi(D_80172CA0) # $s1, 0x8017 -/* B60E78 800E9CD8 3C128017 */ lui $s2, %hi(D_80172C30) # $s2, 0x8017 -/* B60E7C 800E9CDC 3C148017 */ lui $s4, %hi(D_80174CA0) # $s4, 0x8017 -/* B60E80 800E9CE0 AFBF002C */ sw $ra, 0x2c($sp) -/* B60E84 800E9CE4 AC535B88 */ sw $s3, 0x5b88($v0) -/* B60E88 800E9CE8 AC535B8C */ sw $s3, 0x5b8c($v0) -/* B60E8C 800E9CEC AC405B90 */ sw $zero, 0x5b90($v0) -/* B60E90 800E9CF0 AC405B94 */ sw $zero, 0x5b94($v0) -/* B60E94 800E9CF4 26944CA0 */ addiu $s4, %lo(D_80174CA0) # addiu $s4, $s4, 0x4ca0 -/* B60E98 800E9CF8 26522C30 */ addiu $s2, %lo(D_80172C30) # addiu $s2, $s2, 0x2c30 -/* B60E9C 800E9CFC 26312CA0 */ addiu $s1, %lo(D_80172CA0) # addiu $s1, $s1, 0x2ca0 -/* B60EA0 800E9D00 2610F180 */ addiu $s0, %lo(gAudioContext) # addiu $s0, $s0, -0xe80 -.L800E9D04: -/* B60EA4 800E9D04 AE123B28 */ sw $s2, 0x3b28($s0) -/* B60EA8 800E9D08 AE003B20 */ sw $zero, 0x3b20($s0) -/* B60EAC 800E9D0C 02602025 */ move $a0, $s3 -/* B60EB0 800E9D10 0C03A70A */ jal Audio_AudioListPushBack -/* B60EB4 800E9D14 02202825 */ move $a1, $s1 -/* B60EB8 800E9D18 26310080 */ addiu $s1, $s1, 0x80 -/* B60EBC 800E9D1C 26100080 */ addiu $s0, $s0, 0x80 -/* B60EC0 800E9D20 1634FFF8 */ bne $s1, $s4, .L800E9D04 -/* B60EC4 800E9D24 26520080 */ addiu $s2, $s2, 0x80 -/* B60EC8 800E9D28 8FBF002C */ lw $ra, 0x2c($sp) -/* B60ECC 800E9D2C 8FB00018 */ lw $s0, 0x18($sp) -/* B60ED0 800E9D30 8FB1001C */ lw $s1, 0x1c($sp) -/* B60ED4 800E9D34 8FB20020 */ lw $s2, 0x20($sp) -/* B60ED8 800E9D38 8FB30024 */ lw $s3, 0x24($sp) -/* B60EDC 800E9D3C 8FB40028 */ lw $s4, 0x28($sp) -/* B60EE0 800E9D40 03E00008 */ jr $ra -/* B60EE4 800E9D44 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800E9D48.s b/asm/non_matchings/code/audio_seqplayer/func_800E9D48.s deleted file mode 100644 index b0a0ba189d..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800E9D48.s +++ /dev/null @@ -1,7 +0,0 @@ -glabel func_800E9D48 -/* B60EE8 800E9D48 8C850000 */ lw $a1, ($a0) -/* B60EEC 800E9D4C 90A20000 */ lbu $v0, ($a1) -/* B60EF0 800E9D50 24AE0001 */ addiu $t6, $a1, 1 -/* B60EF4 800E9D54 03E00008 */ jr $ra -/* B60EF8 800E9D58 AC8E0000 */ sw $t6, ($a0) - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800E9D5C.s b/asm/non_matchings/code/audio_seqplayer/func_800E9D5C.s deleted file mode 100644 index 8208715e40..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800E9D5C.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800E9D5C -/* B60EFC 800E9D5C 8C850000 */ lw $a1, ($a0) -/* B60F00 800E9D60 90A30000 */ lbu $v1, ($a1) -/* B60F04 800E9D64 24AE0001 */ addiu $t6, $a1, 1 -/* B60F08 800E9D68 AC8E0000 */ sw $t6, ($a0) -/* B60F0C 800E9D6C 91CF0000 */ lbu $t7, ($t6) -/* B60F10 800E9D70 00031A00 */ sll $v1, $v1, 8 -/* B60F14 800E9D74 00031C00 */ sll $v1, $v1, 0x10 -/* B60F18 800E9D78 00031C03 */ sra $v1, $v1, 0x10 -/* B60F1C 800E9D7C 01E31825 */ or $v1, $t7, $v1 -/* B60F20 800E9D80 00031C00 */ sll $v1, $v1, 0x10 -/* B60F24 800E9D84 25D80001 */ addiu $t8, $t6, 1 -/* B60F28 800E9D88 AC980000 */ sw $t8, ($a0) -/* B60F2C 800E9D8C 03E00008 */ jr $ra -/* B60F30 800E9D90 00031403 */ sra $v0, $v1, 0x10 - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800E9D94.s b/asm/non_matchings/code/audio_seqplayer/func_800E9D94.s deleted file mode 100644 index 389f89b55e..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800E9D94.s +++ /dev/null @@ -1,19 +0,0 @@ -glabel func_800E9D94 -/* B60F34 800E9D94 8C820000 */ lw $v0, ($a0) -/* B60F38 800E9D98 90430000 */ lbu $v1, ($v0) -/* B60F3C 800E9D9C 244E0001 */ addiu $t6, $v0, 1 -/* B60F40 800E9DA0 AC8E0000 */ sw $t6, ($a0) -/* B60F44 800E9DA4 306F0080 */ andi $t7, $v1, 0x80 -/* B60F48 800E9DA8 11E00008 */ beqz $t7, .L800E9DCC -/* B60F4C 800E9DAC 00602825 */ move $a1, $v1 -/* B60F50 800E9DB0 91D80000 */ lbu $t8, ($t6) -/* B60F54 800E9DB4 00051A00 */ sll $v1, $a1, 8 -/* B60F58 800E9DB8 30637F00 */ andi $v1, $v1, 0x7f00 -/* B60F5C 800E9DBC 25D90001 */ addiu $t9, $t6, 1 -/* B60F60 800E9DC0 03031825 */ or $v1, $t8, $v1 -/* B60F64 800E9DC4 3063FFFF */ andi $v1, $v1, 0xffff -/* B60F68 800E9DC8 AC990000 */ sw $t9, ($a0) -.L800E9DCC: -/* B60F6C 800E9DCC 03E00008 */ jr $ra -/* B60F70 800E9DD0 00601025 */ move $v0, $v1 - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800E9DD4.s b/asm/non_matchings/code/audio_seqplayer/func_800E9DD4.s deleted file mode 100644 index 081dc94b8c..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800E9DD4.s +++ /dev/null @@ -1,73 +0,0 @@ -glabel func_800E9DD4 -/* B60F74 800E9DD4 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B60F78 800E9DD8 AFBF001C */ sw $ra, 0x1c($sp) -/* B60F7C 800E9DDC AFB00018 */ sw $s0, 0x18($sp) -/* B60F80 800E9DE0 8C820000 */ lw $v0, ($a0) -/* B60F84 800E9DE4 00808025 */ move $s0, $a0 -/* B60F88 800E9DE8 000277C2 */ srl $t6, $v0, 0x1f -/* B60F8C 800E9DEC 51C00036 */ beql $t6, $zero, .L800E9EC8 -/* B60F90 800E9DF0 8FBF001C */ lw $ra, 0x1c($sp) -/* B60F94 800E9DF4 84830008 */ lh $v1, 8($a0) -/* B60F98 800E9DF8 0002C880 */ sll $t9, $v0, 2 -/* B60F9C 800E9DFC 28610002 */ slti $at, $v1, 2 -/* B60FA0 800E9E00 1420000E */ bnez $at, .L800E9E3C -/* B60FA4 800E9E04 246FFFFF */ addiu $t7, $v1, -1 -/* B60FA8 800E9E08 0720002E */ bltz $t9, .L800E9EC4 -/* B60FAC 800E9E0C A48F0008 */ sh $t7, 8($a0) -/* B60FB0 800E9E10 8488000A */ lh $t0, 0xa($a0) -/* B60FB4 800E9E14 84890008 */ lh $t1, 8($a0) -/* B60FB8 800E9E18 0109082A */ slt $at, $t0, $t1 -/* B60FBC 800E9E1C 5420002A */ bnezl $at, .L800E9EC8 -/* B60FC0 800E9E20 8FBF001C */ lw $ra, 0x1c($sp) -/* B60FC4 800E9E24 0C039ED8 */ jal Audio_SeqChanLayerNoteDecay -/* B60FC8 800E9E28 00000000 */ nop -/* B60FCC 800E9E2C 920B0000 */ lbu $t3, ($s0) -/* B60FD0 800E9E30 356C0020 */ ori $t4, $t3, 0x20 -/* B60FD4 800E9E34 10000023 */ b .L800E9EC4 -/* B60FD8 800E9E38 A20C0000 */ sb $t4, ($s0) -.L800E9E3C: -/* B60FDC 800E9E3C 0C03A7B6 */ jal func_800E9ED8 -/* B60FE0 800E9E40 02002025 */ move $a0, $s0 -/* B60FE4 800E9E44 0C03A830 */ jal func_800EA0C0 -/* B60FE8 800E9E48 02002025 */ move $a0, $s0 -/* B60FEC 800E9E4C 2401FFFF */ li $at, -1 -/* B60FF0 800E9E50 1041001C */ beq $v0, $at, .L800E9EC4 -/* B60FF4 800E9E54 00402825 */ move $a1, $v0 -/* B60FF8 800E9E58 0C03AAB8 */ jal func_800EAAE0 -/* B60FFC 800E9E5C 02002025 */ move $a0, $s0 -/* B61000 800E9E60 2401FFFF */ li $at, -1 -/* B61004 800E9E64 10410004 */ beq $v0, $at, .L800E9E78 -/* B61008 800E9E68 00402825 */ move $a1, $v0 -/* B6100C 800E9E6C 0C03A910 */ jal func_800EA440 -/* B61010 800E9E70 02002025 */ move $a0, $s0 -/* B61014 800E9E74 00402825 */ move $a1, $v0 -.L800E9E78: -/* B61018 800E9E78 2401FFFF */ li $at, -1 -/* B6101C 800E9E7C 50410004 */ beql $v0, $at, .L800E9E90 -/* B61020 800E9E80 8E020000 */ lw $v0, ($s0) -/* B61024 800E9E84 0C03A7D9 */ jal func_800E9F64 -/* B61028 800E9E88 02002025 */ move $a0, $s0 -/* B6102C 800E9E8C 8E020000 */ lw $v0, ($s0) -.L800E9E90: -/* B61030 800E9E90 24010001 */ li $at, 1 -/* B61034 800E9E94 00026880 */ sll $t5, $v0, 2 -/* B61038 800E9E98 000D77C2 */ srl $t6, $t5, 0x1f -/* B6103C 800E9E9C 55C1000A */ bnel $t6, $at, .L800E9EC8 -/* B61040 800E9EA0 8FBF001C */ lw $ra, 0x1c($sp) -/* B61044 800E9EA4 8E0F002C */ lw $t7, 0x2c($s0) -/* B61048 800E9EA8 0002C8C0 */ sll $t9, $v0, 3 -/* B6104C 800E9EAC 15E00003 */ bnez $t7, .L800E9EBC -/* B61050 800E9EB0 00000000 */ nop -/* B61054 800E9EB4 07230004 */ bgezl $t9, .L800E9EC8 -/* B61058 800E9EB8 8FBF001C */ lw $ra, 0x1c($sp) -.L800E9EBC: -/* B6105C 800E9EBC 0C039ED8 */ jal Audio_SeqChanLayerNoteDecay -/* B61060 800E9EC0 02002025 */ move $a0, $s0 -.L800E9EC4: -/* B61064 800E9EC4 8FBF001C */ lw $ra, 0x1c($sp) -.L800E9EC8: -/* B61068 800E9EC8 8FB00018 */ lw $s0, 0x18($sp) -/* B6106C 800E9ECC 27BD0020 */ addiu $sp, $sp, 0x20 -/* B61070 800E9ED0 03E00008 */ jr $ra -/* B61074 800E9ED4 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800E9ED8.s b/asm/non_matchings/code/audio_seqplayer/func_800E9ED8.s deleted file mode 100644 index bb07b44eea..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800E9ED8.s +++ /dev/null @@ -1,42 +0,0 @@ -glabel func_800E9ED8 -/* B61078 800E9ED8 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6107C 800E9EDC AFBF0014 */ sw $ra, 0x14($sp) -/* B61080 800E9EE0 8C8E0000 */ lw $t6, ($a0) -/* B61084 800E9EE4 000EC0C0 */ sll $t8, $t6, 3 -/* B61088 800E9EE8 07020006 */ bltzl $t8, .L800E9F04 -/* B6108C 800E9EEC 8C82002C */ lw $v0, 0x2c($a0) -/* B61090 800E9EF0 0C039ED8 */ jal Audio_SeqChanLayerNoteDecay -/* B61094 800E9EF4 AFA40018 */ sw $a0, 0x18($sp) -/* B61098 800E9EF8 1000000A */ b .L800E9F24 -/* B6109C 800E9EFC 8FA40018 */ lw $a0, 0x18($sp) -/* B610A0 800E9F00 8C82002C */ lw $v0, 0x2c($a0) -.L800E9F04: -/* B610A4 800E9F04 50400008 */ beql $v0, $zero, .L800E9F28 -/* B610A8 800E9F08 90820020 */ lbu $v0, 0x20($a0) -/* B610AC 800E9F0C 8C590048 */ lw $t9, 0x48($v0) -/* B610B0 800E9F10 54990005 */ bnel $a0, $t9, .L800E9F28 -/* B610B4 800E9F14 90820020 */ lbu $v0, 0x20($a0) -/* B610B8 800E9F18 0C039ED8 */ jal Audio_SeqChanLayerNoteDecay -/* B610BC 800E9F1C AFA40018 */ sw $a0, 0x18($sp) -/* B610C0 800E9F20 8FA40018 */ lw $a0, 0x18($sp) -.L800E9F24: -/* B610C4 800E9F24 90820020 */ lbu $v0, 0x20($a0) -.L800E9F28: -/* B610C8 800E9F28 2401FF7F */ li $at, -129 -/* B610CC 800E9F2C 00411024 */ and $v0, $v0, $at -/* B610D0 800E9F30 24010001 */ li $at, 1 -/* B610D4 800E9F34 10410003 */ beq $v0, $at, .L800E9F44 -/* B610D8 800E9F38 24010002 */ li $at, 2 -/* B610DC 800E9F3C 54410003 */ bnel $v0, $at, .L800E9F4C -/* B610E0 800E9F40 90890000 */ lbu $t1, ($a0) -.L800E9F44: -/* B610E4 800E9F44 A0800020 */ sb $zero, 0x20($a0) -/* B610E8 800E9F48 90890000 */ lbu $t1, ($a0) -.L800E9F4C: -/* B610EC 800E9F4C 352A0001 */ ori $t2, $t1, 1 -/* B610F0 800E9F50 A08A0000 */ sb $t2, ($a0) -/* B610F4 800E9F54 8FBF0014 */ lw $ra, 0x14($sp) -/* B610F8 800E9F58 27BD0018 */ addiu $sp, $sp, 0x18 -/* B610FC 800E9F5C 03E00008 */ jr $ra -/* B61100 800E9F60 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800E9F64.s b/asm/non_matchings/code/audio_seqplayer/func_800E9F64.s deleted file mode 100644 index e9572bbec7..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800E9F64.s +++ /dev/null @@ -1,97 +0,0 @@ -glabel func_800E9F64 -/* B61104 800E9F64 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B61108 800E9F68 AFBF0014 */ sw $ra, 0x14($sp) -/* B6110C 800E9F6C 8C820000 */ lw $v0, ($a0) -/* B61110 800E9F70 00803825 */ move $a3, $a0 -/* B61114 800E9F74 00027880 */ sll $t7, $v0, 2 -/* B61118 800E9F78 05E20013 */ bltzl $t7, .L800E9FC8 -/* B6111C 800E9F7C 000218C0 */ sll $v1, $v0, 3 -/* B61120 800E9F80 8C83004C */ lw $v1, 0x4c($a0) -/* B61124 800E9F84 50600010 */ beql $v1, $zero, .L800E9FC8 -/* B61128 800E9F88 000218C0 */ sll $v1, $v0, 3 -/* B6112C 800E9F8C 8C780000 */ lw $t8, ($v1) -/* B61130 800E9F90 24010002 */ li $at, 2 -/* B61134 800E9F94 8F040000 */ lw $a0, ($t8) -/* B61138 800E9F98 0004CF02 */ srl $t9, $a0, 0x1c -/* B6113C 800E9F9C 17210009 */ bne $t9, $at, .L800E9FC4 -/* B61140 800E9FA0 00044100 */ sll $t0, $a0, 4 -/* B61144 800E9FA4 00084F82 */ srl $t1, $t0, 0x1e -/* B61148 800E9FA8 51200007 */ beql $t1, $zero, .L800E9FC8 -/* B6114C 800E9FAC 000218C0 */ sll $v1, $v0, 3 -/* B61150 800E9FB0 90EB0000 */ lbu $t3, ($a3) -/* B61154 800E9FB4 2402FFFF */ li $v0, -1 -/* B61158 800E9FB8 356C0020 */ ori $t4, $t3, 0x20 -/* B6115C 800E9FBC 1000003C */ b .L800EA0B0 -/* B61160 800E9FC0 A0EC0000 */ sb $t4, ($a3) -.L800E9FC4: -/* B61164 800E9FC4 000218C0 */ sll $v1, $v0, 3 -.L800E9FC8: -/* B61168 800E9FC8 24040001 */ li $a0, 1 -/* B6116C 800E9FCC 00031FC2 */ srl $v1, $v1, 0x1f -/* B61170 800E9FD0 14830006 */ bne $a0, $v1, .L800E9FEC -/* B61174 800E9FD4 00026980 */ sll $t5, $v0, 6 -/* B61178 800E9FD8 000D77C2 */ srl $t6, $t5, 0x1f -/* B6117C 800E9FDC 148E0003 */ bne $a0, $t6, .L800E9FEC -/* B61180 800E9FE0 00000000 */ nop -/* B61184 800E9FE4 10000032 */ b .L800EA0B0 -/* B61188 800E9FE8 00001025 */ move $v0, $zero -.L800E9FEC: -/* B6118C 800E9FEC 14830015 */ bne $a0, $v1, .L800EA044 -/* B61190 800E9FF0 00000000 */ nop -/* B61194 800E9FF4 8CE6002C */ lw $a2, 0x2c($a3) -/* B61198 800E9FF8 0002C100 */ sll $t8, $v0, 4 -/* B6119C 800E9FFC 10C00011 */ beqz $a2, .L800EA044 -/* B611A0 800EA000 00000000 */ nop -/* B611A4 800EA004 0701000F */ bgez $t8, .L800EA044 -/* B611A8 800EA008 00000000 */ nop -/* B611AC 800EA00C 14A4000D */ bne $a1, $a0, .L800EA044 -/* B611B0 800EA010 00000000 */ nop -/* B611B4 800EA014 8CD90044 */ lw $t9, 0x44($a2) -/* B611B8 800EA018 14F9000A */ bne $a3, $t9, .L800EA044 -/* B611BC 800EA01C 00000000 */ nop -/* B611C0 800EA020 8CE8004C */ lw $t0, 0x4c($a3) -/* B611C4 800EA024 00C02025 */ move $a0, $a2 -/* B611C8 800EA028 00E02825 */ move $a1, $a3 -/* B611CC 800EA02C 55000018 */ bnezl $t0, .L800EA090 -/* B611D0 800EA030 8CE6002C */ lw $a2, 0x2c($a3) -/* B611D4 800EA034 0C039F29 */ jal Audio_InitSyntheticWave -/* B611D8 800EA038 AFA70018 */ sw $a3, 0x18($sp) -/* B611DC 800EA03C 10000013 */ b .L800EA08C -/* B611E0 800EA040 8FA70018 */ lw $a3, 0x18($sp) -.L800EA044: -/* B611E4 800EA044 14A00004 */ bnez $a1, .L800EA058 -/* B611E8 800EA048 00E02025 */ move $a0, $a3 -/* B611EC 800EA04C 0C039ED8 */ jal Audio_SeqChanLayerNoteDecay -/* B611F0 800EA050 AFA70018 */ sw $a3, 0x18($sp) -/* B611F4 800EA054 8FA70018 */ lw $a3, 0x18($sp) -.L800EA058: -/* B611F8 800EA058 00E02025 */ move $a0, $a3 -/* B611FC 800EA05C 0C03A12D */ jal Audio_AllocNote -/* B61200 800EA060 AFA70018 */ sw $a3, 0x18($sp) -/* B61204 800EA064 8FA70018 */ lw $a3, 0x18($sp) -/* B61208 800EA068 10400008 */ beqz $v0, .L800EA08C -/* B6120C 800EA06C ACE2002C */ sw $v0, 0x2c($a3) -/* B61210 800EA070 8C490044 */ lw $t1, 0x44($v0) -/* B61214 800EA074 00402025 */ move $a0, $v0 -/* B61218 800EA078 54E90005 */ bnel $a3, $t1, .L800EA090 -/* B6121C 800EA07C 8CE6002C */ lw $a2, 0x2c($a3) -/* B61220 800EA080 0C03A3C0 */ jal Audio_NoteVibratoInit -/* B61224 800EA084 AFA70018 */ sw $a3, 0x18($sp) -/* B61228 800EA088 8FA70018 */ lw $a3, 0x18($sp) -.L800EA08C: -/* B6122C 800EA08C 8CE6002C */ lw $a2, 0x2c($a3) -.L800EA090: -/* B61230 800EA090 50C00007 */ beql $a2, $zero, .L800EA0B0 -/* B61234 800EA094 00001025 */ move $v0, $zero -/* B61238 800EA098 8CCA0044 */ lw $t2, 0x44($a2) -/* B6123C 800EA09C 54EA0004 */ bnel $a3, $t2, .L800EA0B0 -/* B61240 800EA0A0 00001025 */ move $v0, $zero -/* B61244 800EA0A4 0C03A3EE */ jal Audio_NotePortamentoInit -/* B61248 800EA0A8 00C02025 */ move $a0, $a2 -/* B6124C 800EA0AC 00001025 */ move $v0, $zero -.L800EA0B0: -/* B61250 800EA0B0 8FBF0014 */ lw $ra, 0x14($sp) -/* B61254 800EA0B4 27BD0018 */ addiu $sp, $sp, 0x18 -/* B61258 800EA0B8 03E00008 */ jr $ra -/* B6125C 800EA0BC 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800EA0C0.s b/asm/non_matchings/code/audio_seqplayer/func_800EA0C0.s deleted file mode 100644 index fda1f0fe26..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800EA0C0.s +++ /dev/null @@ -1,277 +0,0 @@ -.late_rodata -glabel D_80149658 - .float 16129 - -glabel jtbl_8014965C - .word L800EA180 - .word L800EA1C0 - .word L800EA22C - .word L800EA1E8 - .word L800EA1E8 - .word L800EA23C - .word L800EA2C0 - .word L800EA340 - .word L800EA1C0 - .word L800EA180 - .word L800EA348 - .word L800EA370 - .word L800EA380 - .word L800EA390 - .word L800EA360 - -.text -glabel func_800EA0C0 -/* B61260 800EA0C0 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B61264 800EA0C4 AFBF0034 */ sw $ra, 0x34($sp) -/* B61268 800EA0C8 AFB40030 */ sw $s4, 0x30($sp) -/* B6126C 800EA0CC AFB3002C */ sw $s3, 0x2c($sp) -/* B61270 800EA0D0 AFB20028 */ sw $s2, 0x28($sp) -/* B61274 800EA0D4 AFB10024 */ sw $s1, 0x24($sp) -/* B61278 800EA0D8 AFB00020 */ sw $s0, 0x20($sp) -/* B6127C 800EA0DC F7B40018 */ sdc1 $f20, 0x18($sp) -/* B61280 800EA0E0 8C940050 */ lw $s4, 0x50($a0) -/* B61284 800EA0E4 3C018015 */ lui $at, %hi(D_80149658) -/* B61288 800EA0E8 00808825 */ move $s1, $a0 -/* B6128C 800EA0EC C4349658 */ lwc1 $f20, %lo(D_80149658)($at) -/* B61290 800EA0F0 24920054 */ addiu $s2, $a0, 0x54 -/* B61294 800EA0F4 8E93004C */ lw $s3, 0x4c($s4) -.L800EA0F8: -/* B61298 800EA0F8 0C03A752 */ jal func_800E9D48 -/* B6129C 800EA0FC 02402025 */ move $a0, $s2 -/* B612A0 800EA100 284100C1 */ slti $at, $v0, 0xc1 -/* B612A4 800EA104 305000FF */ andi $s0, $v0, 0xff -/* B612A8 800EA108 10200003 */ beqz $at, .L800EA118 -/* B612AC 800EA10C 00402025 */ move $a0, $v0 -/* B612B0 800EA110 100000C2 */ b .L800EA41C -/* B612B4 800EA114 02001025 */ move $v0, $s0 -.L800EA118: -/* B612B8 800EA118 288100F2 */ slti $at, $a0, 0xf2 -/* B612BC 800EA11C 1420000F */ bnez $at, .L800EA15C -/* B612C0 800EA120 248EFF3F */ addiu $t6, $a0, -0xc1 -/* B612C4 800EA124 02402025 */ move $a0, $s2 -/* B612C8 800EA128 0C03A4D0 */ jal func_800E9340 -/* B612CC 800EA12C 320500FF */ andi $a1, $s0, 0xff -/* B612D0 800EA130 02602025 */ move $a0, $s3 -/* B612D4 800EA134 02402825 */ move $a1, $s2 -/* B612D8 800EA138 02003025 */ move $a2, $s0 -/* B612DC 800EA13C 0C03A4EA */ jal func_800E93A8 -/* B612E0 800EA140 00403825 */ move $a3, $v0 -/* B612E4 800EA144 1040FFEC */ beqz $v0, .L800EA0F8 -/* B612E8 800EA148 00000000 */ nop -/* B612EC 800EA14C 0C03A5FF */ jal func_800E97FC -/* B612F0 800EA150 02202025 */ move $a0, $s1 -/* B612F4 800EA154 100000B1 */ b .L800EA41C -/* B612F8 800EA158 2402FFFF */ li $v0, -1 -.L800EA15C: -/* B612FC 800EA15C 2DC1000F */ sltiu $at, $t6, 0xf -/* B61300 800EA160 10200095 */ beqz $at, .L800EA3B8 -/* B61304 800EA164 308300F0 */ andi $v1, $a0, 0xf0 -/* B61308 800EA168 000E7080 */ sll $t6, $t6, 2 -/* B6130C 800EA16C 3C018015 */ lui $at, %hi(jtbl_8014965C) -/* B61310 800EA170 002E0821 */ addu $at, $at, $t6 -/* B61314 800EA174 8C2E965C */ lw $t6, %lo(jtbl_8014965C)($at) -/* B61318 800EA178 01C00008 */ jr $t6 -/* B6131C 800EA17C 00000000 */ nop -glabel L800EA180 -/* B61320 800EA180 8E430000 */ lw $v1, ($s2) -/* B61324 800EA184 240100C1 */ li $at, 193 -/* B61328 800EA188 90650000 */ lbu $a1, ($v1) -/* B6132C 800EA18C 246F0001 */ addiu $t7, $v1, 1 -/* B61330 800EA190 14810009 */ bne $a0, $at, .L800EA1B8 -/* B61334 800EA194 AE4F0000 */ sw $t7, ($s2) -/* B61338 800EA198 00A50019 */ multu $a1, $a1 -/* B6133C 800EA19C 0000C012 */ mflo $t8 -/* B61340 800EA1A0 44982000 */ mtc1 $t8, $f4 -/* B61344 800EA1A4 00000000 */ nop -/* B61348 800EA1A8 468021A0 */ cvt.s.w $f6, $f4 -/* B6134C 800EA1AC 46143203 */ div.s $f8, $f6, $f20 -/* B61350 800EA1B0 1000FFD1 */ b .L800EA0F8 -/* B61354 800EA1B4 E628003C */ swc1 $f8, 0x3c($s1) -.L800EA1B8: -/* B61358 800EA1B8 1000FFCF */ b .L800EA0F8 -/* B6135C 800EA1BC A2250006 */ sb $a1, 6($s1) -glabel L800EA1C0 -/* B61360 800EA1C0 8E430000 */ lw $v1, ($s2) -/* B61364 800EA1C4 240100C9 */ li $at, 201 -/* B61368 800EA1C8 90650000 */ lbu $a1, ($v1) -/* B6136C 800EA1CC 24790001 */ addiu $t9, $v1, 1 -/* B61370 800EA1D0 14810003 */ bne $a0, $at, .L800EA1E0 -/* B61374 800EA1D4 AE590000 */ sw $t9, ($s2) -/* B61378 800EA1D8 1000FFC7 */ b .L800EA0F8 -/* B6137C 800EA1DC A2250003 */ sb $a1, 3($s1) -.L800EA1E0: -/* B61380 800EA1E0 1000FFC5 */ b .L800EA0F8 -/* B61384 800EA1E4 A6250010 */ sh $a1, 0x10($s1) -glabel L800EA1E8 -/* B61388 800EA1E8 240100C4 */ li $at, 196 -/* B6138C 800EA1EC 54810006 */ bnel $a0, $at, .L800EA208 -/* B61390 800EA1F0 922B0000 */ lbu $t3, ($s1) -/* B61394 800EA1F4 92290000 */ lbu $t1, ($s1) -/* B61398 800EA1F8 352A0010 */ ori $t2, $t1, 0x10 -/* B6139C 800EA1FC 10000004 */ b .L800EA210 -/* B613A0 800EA200 A22A0000 */ sb $t2, ($s1) -/* B613A4 800EA204 922B0000 */ lbu $t3, ($s1) -.L800EA208: -/* B613A8 800EA208 316CFFEF */ andi $t4, $t3, 0xffef -/* B613AC 800EA20C A22C0000 */ sb $t4, ($s1) -.L800EA210: -/* B613B0 800EA210 922D0000 */ lbu $t5, ($s1) -/* B613B4 800EA214 02202025 */ move $a0, $s1 -/* B613B8 800EA218 31AEFFFD */ andi $t6, $t5, 0xfffd -/* B613BC 800EA21C 0C039ED8 */ jal Audio_SeqChanLayerNoteDecay -/* B613C0 800EA220 A22E0000 */ sb $t6, ($s1) -/* B613C4 800EA224 1000FFB4 */ b .L800EA0F8 -/* B613C8 800EA228 00000000 */ nop -glabel L800EA22C -/* B613CC 800EA22C 0C03A765 */ jal func_800E9D94 -/* B613D0 800EA230 02402025 */ move $a0, $s2 -/* B613D4 800EA234 1000FFB0 */ b .L800EA0F8 -/* B613D8 800EA238 A6220012 */ sh $v0, 0x12($s1) -glabel L800EA23C -/* B613DC 800EA23C 0C03A752 */ jal func_800E9D48 -/* B613E0 800EA240 02402025 */ move $a0, $s2 -/* B613E4 800EA244 2841007E */ slti $at, $v0, 0x7e -/* B613E8 800EA248 305000FF */ andi $s0, $v0, 0xff -/* B613EC 800EA24C 14200012 */ bnez $at, .L800EA298 -/* B613F0 800EA250 00402025 */ move $a0, $v0 -/* B613F4 800EA254 2401007E */ li $at, 126 -/* B613F8 800EA258 14410003 */ bne $v0, $at, .L800EA268 -/* B613FC 800EA25C 240F0001 */ li $t7, 1 -/* B61400 800EA260 10000008 */ b .L800EA284 -/* B61404 800EA264 A22F0002 */ sb $t7, 2($s1) -.L800EA268: -/* B61408 800EA268 2401007F */ li $at, 127 -/* B6140C 800EA26C 54810004 */ bnel $a0, $at, .L800EA280 -/* B61410 800EA270 A2220002 */ sb $v0, 2($s1) -/* B61414 800EA274 10000003 */ b .L800EA284 -/* B61418 800EA278 A2200002 */ sb $zero, 2($s1) -/* B6141C 800EA27C A2220002 */ sb $v0, 2($s1) -.L800EA280: -/* B61420 800EA280 AE200048 */ sw $zero, 0x48($s1) -.L800EA284: -/* B61424 800EA284 240100FF */ li $at, 255 -/* B61428 800EA288 1481FF9B */ bne $a0, $at, .L800EA0F8 -/* B6142C 800EA28C 00000000 */ nop -/* B61430 800EA290 1000FF99 */ b .L800EA0F8 -/* B61434 800EA294 A2200018 */ sb $zero, 0x18($s1) -.L800EA298: -/* B61438 800EA298 02802025 */ move $a0, $s4 -/* B6143C 800EA29C 320500FF */ andi $a1, $s0, 0xff -/* B61440 800EA2A0 26260048 */ addiu $a2, $s1, 0x48 -/* B61444 800EA2A4 0C03ABC9 */ jal func_800EAF24 -/* B61448 800EA2A8 26270018 */ addiu $a3, $s1, 0x18 -/* B6144C 800EA2AC 1440FF92 */ bnez $v0, .L800EA0F8 -/* B61450 800EA2B0 A2220002 */ sb $v0, 2($s1) -/* B61454 800EA2B4 241800FF */ li $t8, 255 -/* B61458 800EA2B8 1000FF8F */ b .L800EA0F8 -/* B6145C 800EA2BC A2380002 */ sb $t8, 2($s1) -glabel L800EA2C0 -/* B61460 800EA2C0 0C03A752 */ jal func_800E9D48 -/* B61464 800EA2C4 02402025 */ move $a0, $s2 -/* B61468 800EA2C8 A2220020 */ sb $v0, 0x20($s1) -/* B6146C 800EA2CC 0C03A752 */ jal func_800E9D48 -/* B61470 800EA2D0 02402025 */ move $a0, $s2 -/* B61474 800EA2D4 86990026 */ lh $t9, 0x26($s4) -/* B61478 800EA2D8 86280010 */ lh $t0, 0x10($s1) -/* B6147C 800EA2DC 8669000E */ lh $t1, 0xe($s3) -/* B61480 800EA2E0 00598021 */ addu $s0, $v0, $t9 -/* B61484 800EA2E4 02088021 */ addu $s0, $s0, $t0 -/* B61488 800EA2E8 02098021 */ addu $s0, $s0, $t1 -/* B6148C 800EA2EC 321000FF */ andi $s0, $s0, 0xff -/* B61490 800EA2F0 2A010080 */ slti $at, $s0, 0x80 -/* B61494 800EA2F4 54200003 */ bnezl $at, .L800EA304 -/* B61498 800EA2F8 922A0020 */ lbu $t2, 0x20($s1) -/* B6149C 800EA2FC 00008025 */ move $s0, $zero -/* B614A0 800EA300 922A0020 */ lbu $t2, 0x20($s1) -.L800EA304: -/* B614A4 800EA304 A2300005 */ sb $s0, 5($s1) -/* B614A8 800EA308 314B0080 */ andi $t3, $t2, 0x80 -/* B614AC 800EA30C 11600008 */ beqz $t3, .L800EA330 -/* B614B0 800EA310 00000000 */ nop -/* B614B4 800EA314 8E4C0000 */ lw $t4, ($s2) -/* B614B8 800EA318 918D0000 */ lbu $t5, ($t4) -/* B614BC 800EA31C A62D000E */ sh $t5, 0xe($s1) -/* B614C0 800EA320 8E4E0000 */ lw $t6, ($s2) -/* B614C4 800EA324 25CF0001 */ addiu $t7, $t6, 1 -/* B614C8 800EA328 1000FF73 */ b .L800EA0F8 -/* B614CC 800EA32C AE4F0000 */ sw $t7, ($s2) -.L800EA330: -/* B614D0 800EA330 0C03A765 */ jal func_800E9D94 -/* B614D4 800EA334 02402025 */ move $a0, $s2 -/* B614D8 800EA338 1000FF6F */ b .L800EA0F8 -/* B614DC 800EA33C A622000E */ sh $v0, 0xe($s1) -glabel L800EA340 -/* B614E0 800EA340 1000FF6D */ b .L800EA0F8 -/* B614E4 800EA344 A2200020 */ sb $zero, 0x20($s1) -glabel L800EA348 -/* B614E8 800EA348 0C03A757 */ jal func_800E9D5C -/* B614EC 800EA34C 02402025 */ move $a0, $s2 -/* B614F0 800EA350 8E780018 */ lw $t8, 0x18($s3) -/* B614F4 800EA354 3059FFFF */ andi $t9, $v0, 0xffff -/* B614F8 800EA358 03194021 */ addu $t0, $t8, $t9 -/* B614FC 800EA35C AE28001C */ sw $t0, 0x1c($s1) -glabel L800EA360 -/* B61500 800EA360 0C03A752 */ jal func_800E9D48 -/* B61504 800EA364 02402025 */ move $a0, $s2 -/* B61508 800EA368 1000FF63 */ b .L800EA0F8 -/* B6150C 800EA36C A2220018 */ sb $v0, 0x18($s1) -glabel L800EA370 -/* B61510 800EA370 922A0000 */ lbu $t2, ($s1) -/* B61514 800EA374 354B0004 */ ori $t3, $t2, 4 -/* B61518 800EA378 1000FF5F */ b .L800EA0F8 -/* B6151C 800EA37C A22B0000 */ sb $t3, ($s1) -glabel L800EA380 -/* B61520 800EA380 0C03A752 */ jal func_800E9D48 -/* B61524 800EA384 02402025 */ move $a0, $s2 -/* B61528 800EA388 1000FF5B */ b .L800EA0F8 -/* B6152C 800EA38C A2220001 */ sb $v0, 1($s1) -glabel L800EA390 -/* B61530 800EA390 0C03A752 */ jal func_800E9D48 -/* B61534 800EA394 02402025 */ move $a0, $s2 -/* B61538 800EA398 244C0080 */ addiu $t4, $v0, 0x80 -/* B6153C 800EA39C 318D00FF */ andi $t5, $t4, 0xff -/* B61540 800EA3A0 000D7080 */ sll $t6, $t5, 2 -/* B61544 800EA3A4 3C018013 */ lui $at, %hi(D_8012F4B4) -/* B61548 800EA3A8 002E0821 */ addu $at, $at, $t6 -/* B6154C 800EA3AC C42AF4B4 */ lwc1 $f10, %lo(D_8012F4B4)($at) -/* B61550 800EA3B0 1000FF51 */ b .L800EA0F8 -/* B61554 800EA3B4 E62A0034 */ swc1 $f10, 0x34($s1) -.L800EA3B8: -/* B61558 800EA3B8 240100D0 */ li $at, 208 -/* B6155C 800EA3BC 10610005 */ beq $v1, $at, .L800EA3D4 -/* B61560 800EA3C0 240100E0 */ li $at, 224 -/* B61564 800EA3C4 50610010 */ beql $v1, $at, .L800EA408 -/* B61568 800EA3C8 8E690098 */ lw $t1, 0x98($s3) -/* B6156C 800EA3CC 1000FF4A */ b .L800EA0F8 -/* B61570 800EA3D0 00000000 */ nop -.L800EA3D4: -/* B61574 800EA3D4 8E6F0094 */ lw $t7, 0x94($s3) -/* B61578 800EA3D8 3098000F */ andi $t8, $a0, 0xf -/* B6157C 800EA3DC 01F8C821 */ addu $t9, $t7, $t8 -/* B61580 800EA3E0 93250000 */ lbu $a1, ($t9) -/* B61584 800EA3E4 00A50019 */ multu $a1, $a1 -/* B61588 800EA3E8 00004012 */ mflo $t0 -/* B6158C 800EA3EC 44888000 */ mtc1 $t0, $f16 -/* B61590 800EA3F0 00000000 */ nop -/* B61594 800EA3F4 468084A0 */ cvt.s.w $f18, $f16 -/* B61598 800EA3F8 46149103 */ div.s $f4, $f18, $f20 -/* B6159C 800EA3FC 1000FF3E */ b .L800EA0F8 -/* B615A0 800EA400 E624003C */ swc1 $f4, 0x3c($s1) -/* B615A4 800EA404 8E690098 */ lw $t1, 0x98($s3) -.L800EA408: -/* B615A8 800EA408 308A000F */ andi $t2, $a0, 0xf -/* B615AC 800EA40C 012A5821 */ addu $t3, $t1, $t2 -/* B615B0 800EA410 916C0000 */ lbu $t4, ($t3) -/* B615B4 800EA414 1000FF38 */ b .L800EA0F8 -/* B615B8 800EA418 A22C0003 */ sb $t4, 3($s1) -.L800EA41C: -/* B615BC 800EA41C 8FBF0034 */ lw $ra, 0x34($sp) -/* B615C0 800EA420 D7B40018 */ ldc1 $f20, 0x18($sp) -/* B615C4 800EA424 8FB00020 */ lw $s0, 0x20($sp) -/* B615C8 800EA428 8FB10024 */ lw $s1, 0x24($sp) -/* B615CC 800EA42C 8FB20028 */ lw $s2, 0x28($sp) -/* B615D0 800EA430 8FB3002C */ lw $s3, 0x2c($sp) -/* B615D4 800EA434 8FB40030 */ lw $s4, 0x30($sp) -/* B615D8 800EA438 03E00008 */ jr $ra -/* B615DC 800EA43C 27BD0038 */ addiu $sp, $sp, 0x38 - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800EA440.s b/asm/non_matchings/code/audio_seqplayer/func_800EA440.s deleted file mode 100644 index 801abf2b98..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800EA440.s +++ /dev/null @@ -1,483 +0,0 @@ -.late_rodata -glabel jtbl_80149698 - .word L800EA728 - .word L800EA734 - .word L800EA728 - .word L800EA734 - .word L800EA728 - -glabel D_801496AC - .float 32766 - -.text -glabel func_800EA440 -/* B615E0 800EA440 27BDFF88 */ addiu $sp, $sp, -0x78 -/* B615E4 800EA444 AFBF0014 */ sw $ra, 0x14($sp) -/* B615E8 800EA448 AFA5007C */ sw $a1, 0x7c($sp) -/* B615EC 800EA44C 90820002 */ lbu $v0, 2($a0) -/* B615F0 800EA450 8C830050 */ lw $v1, 0x50($a0) -/* B615F4 800EA454 240800FF */ li $t0, 255 -/* B615F8 800EA458 00803025 */ move $a2, $a0 -/* B615FC 800EA45C 240B0001 */ li $t3, 1 -/* B61600 800EA460 14480008 */ bne $v0, $t0, .L800EA484 -/* B61604 800EA464 8C6A004C */ lw $t2, 0x4c($v1) -/* B61608 800EA468 8C6E0000 */ lw $t6, ($v1) -/* B6160C 800EA46C 000EC100 */ sll $t8, $t6, 4 -/* B61610 800EA470 07020004 */ bltzl $t8, .L800EA484 -/* B61614 800EA474 84620024 */ lh $v0, 0x24($v1) -/* B61618 800EA478 10000195 */ b .L800EAAD0 -/* B6161C 800EA47C 2402FFFF */ li $v0, -1 -/* B61620 800EA480 84620024 */ lh $v0, 0x24($v1) -.L800EA484: -/* B61624 800EA484 10400006 */ beqz $v0, .L800EA4A0 -/* B61628 800EA488 93B9007F */ lbu $t9, 0x7f($sp) -/* B6162C 800EA48C 24010001 */ li $at, 1 -/* B61630 800EA490 10410029 */ beq $v0, $at, .L800EA538 -/* B61634 800EA494 93AE007F */ lbu $t6, 0x7f($sp) -/* B61638 800EA498 10000045 */ b .L800EA5B0 -/* B6163C 800EA49C 854F000E */ lh $t7, 0xe($t2) -.L800EA4A0: -/* B61640 800EA4A0 846C0026 */ lh $t4, 0x26($v1) -/* B61644 800EA4A4 84CE0010 */ lh $t6, 0x10($a2) -/* B61648 800EA4A8 032C6821 */ addu $t5, $t9, $t4 -/* B6164C 800EA4AC 01AE4821 */ addu $t1, $t5, $t6 -/* B61650 800EA4B0 312500FF */ andi $a1, $t1, 0xff -/* B61654 800EA4B4 A0C50004 */ sb $a1, 4($a2) -/* B61658 800EA4B8 90640007 */ lbu $a0, 7($v1) -/* B6165C 800EA4BC AFAB0074 */ sw $t3, 0x74($sp) -/* B61660 800EA4C0 AFAA0040 */ sw $t2, 0x40($sp) -/* B61664 800EA4C4 0C039D5B */ jal Audio_GetDrum -/* B61668 800EA4C8 AFA60078 */ sw $a2, 0x78($sp) -/* B6166C 800EA4CC 8FA60078 */ lw $a2, 0x78($sp) -/* B61670 800EA4D0 8FAA0040 */ lw $t2, 0x40($sp) -/* B61674 800EA4D4 14400008 */ bnez $v0, .L800EA4F8 -/* B61678 800EA4D8 8FAB0074 */ lw $t3, 0x74($sp) -/* B6167C 800EA4DC 90D80000 */ lbu $t8, ($a2) -/* B61680 800EA4E0 84CC0008 */ lh $t4, 8($a2) -/* B61684 800EA4E4 2402FFFF */ li $v0, -1 -/* B61688 800EA4E8 37190020 */ ori $t9, $t8, 0x20 -/* B6168C 800EA4EC A0D90000 */ sb $t9, ($a2) -/* B61690 800EA4F0 10000177 */ b .L800EAAD0 -/* B61694 800EA4F4 A4CC000C */ sh $t4, 0xc($a2) -.L800EA4F8: -/* B61698 800EA4F8 8C4D000C */ lw $t5, 0xc($v0) -/* B6169C 800EA4FC 8CCF0000 */ lw $t7, ($a2) -/* B616A0 800EA500 24430004 */ addiu $v1, $v0, 4 -/* B616A4 800EA504 ACCD001C */ sw $t5, 0x1c($a2) -/* B616A8 800EA508 904E0000 */ lbu $t6, ($v0) -/* B616AC 800EA50C 000FC940 */ sll $t9, $t7, 5 -/* B616B0 800EA510 07200003 */ bltz $t9, .L800EA520 -/* B616B4 800EA514 A0CE0018 */ sb $t6, 0x18($a2) -/* B616B8 800EA518 904C0001 */ lbu $t4, 1($v0) -/* B616BC 800EA51C A0CC0006 */ sb $t4, 6($a2) -.L800EA520: -/* B616C0 800EA520 ACC3004C */ sw $v1, 0x4c($a2) -/* B616C4 800EA524 C4640004 */ lwc1 $f4, 4($v1) -/* B616C8 800EA528 3C058017 */ lui $a1, %hi(gAudioContext) # $a1, 0x8017 -/* B616CC 800EA52C 24A5F180 */ addiu $a1, %lo(gAudioContext) # addiu $a1, $a1, -0xe80 -/* B616D0 800EA530 10000103 */ b .L800EA940 -/* B616D4 800EA534 E4C40030 */ swc1 $f4, 0x30($a2) -.L800EA538: -/* B616D8 800EA538 93A2007F */ lbu $v0, 0x7f($sp) -/* B616DC 800EA53C 84CD0010 */ lh $t5, 0x10($a2) -/* B616E0 800EA540 A0C20004 */ sb $v0, 4($a2) -/* B616E4 800EA544 90640007 */ lbu $a0, 7($v1) -/* B616E8 800EA548 000D7180 */ sll $t6, $t5, 6 -/* B616EC 800EA54C 01C23821 */ addu $a3, $t6, $v0 -/* B616F0 800EA550 30E5FFFF */ andi $a1, $a3, 0xffff -/* B616F4 800EA554 AFAB0074 */ sw $t3, 0x74($sp) -/* B616F8 800EA558 AFAA0040 */ sw $t2, 0x40($sp) -/* B616FC 800EA55C 0C039D94 */ jal Audio_GetUnkInstrument -/* B61700 800EA560 AFA60078 */ sw $a2, 0x78($sp) -/* B61704 800EA564 8FA60078 */ lw $a2, 0x78($sp) -/* B61708 800EA568 8FAA0040 */ lw $t2, 0x40($sp) -/* B6170C 800EA56C 14400009 */ bnez $v0, .L800EA594 -/* B61710 800EA570 8FAB0074 */ lw $t3, 0x74($sp) -/* B61714 800EA574 90D80000 */ lbu $t8, ($a2) -/* B61718 800EA578 84CC0008 */ lh $t4, 8($a2) -/* B6171C 800EA57C 2402FFFF */ li $v0, -1 -/* B61720 800EA580 37190020 */ ori $t9, $t8, 0x20 -/* B61724 800EA584 258D0001 */ addiu $t5, $t4, 1 -/* B61728 800EA588 A0D90000 */ sb $t9, ($a2) -/* B6172C 800EA58C 10000150 */ b .L800EAAD0 -/* B61730 800EA590 A4CD000C */ sh $t5, 0xc($a2) -.L800EA594: -/* B61734 800EA594 ACC2004C */ sw $v0, 0x4c($a2) -/* B61738 800EA598 C4460004 */ lwc1 $f6, 4($v0) -/* B6173C 800EA59C 3C058017 */ lui $a1, %hi(gAudioContext) # $a1, 0x8017 -/* B61740 800EA5A0 24A5F180 */ addiu $a1, %lo(gAudioContext) # addiu $a1, $a1, -0xe80 -/* B61744 800EA5A4 100000E6 */ b .L800EA940 -/* B61748 800EA5A8 E4C60030 */ swc1 $f6, 0x30($a2) -/* B6174C 800EA5AC 854F000E */ lh $t7, 0xe($t2) -.L800EA5B0: -/* B61750 800EA5B0 84790026 */ lh $t9, 0x26($v1) -/* B61754 800EA5B4 84CD0010 */ lh $t5, 0x10($a2) -/* B61758 800EA5B8 01CFC021 */ addu $t8, $t6, $t7 -/* B6175C 800EA5BC 03196021 */ addu $t4, $t8, $t9 -/* B61760 800EA5C0 018D4821 */ addu $t1, $t4, $t5 -/* B61764 800EA5C4 312900FF */ andi $t1, $t1, 0xff -/* B61768 800EA5C8 29210080 */ slti $at, $t1, 0x80 -/* B6176C 800EA5CC A0C90004 */ sb $t1, 4($a2) -/* B61770 800EA5D0 14200006 */ bnez $at, .L800EA5EC -/* B61774 800EA5D4 01203825 */ move $a3, $t1 -/* B61778 800EA5D8 90CF0000 */ lbu $t7, ($a2) -/* B6177C 800EA5DC 2402FFFF */ li $v0, -1 -/* B61780 800EA5E0 35F80020 */ ori $t8, $t7, 0x20 -/* B61784 800EA5E4 1000013A */ b .L800EAAD0 -/* B61788 800EA5E8 A0D80000 */ sb $t8, ($a2) -.L800EA5EC: -/* B6178C 800EA5EC 90D90002 */ lbu $t9, 2($a2) -/* B61790 800EA5F0 55190004 */ bnel $t0, $t9, .L800EA604 -/* B61794 800EA5F4 8CC40048 */ lw $a0, 0x48($a2) -/* B61798 800EA5F8 10000002 */ b .L800EA604 -/* B6179C 800EA5FC 8C640048 */ lw $a0, 0x48($v1) -/* B617A0 800EA600 8CC40048 */ lw $a0, 0x48($a2) -.L800EA604: -/* B617A4 800EA604 90CC0020 */ lbu $t4, 0x20($a2) -/* B617A8 800EA608 1180009E */ beqz $t4, .L800EA884 -/* B617AC 800EA60C 00000000 */ nop -/* B617B0 800EA610 24C80020 */ addiu $t0, $a2, 0x20 -/* B617B4 800EA614 AFA80060 */ sw $t0, 0x60($sp) -/* B617B8 800EA618 90C30005 */ lbu $v1, 5($a2) -/* B617BC 800EA61C 0067082A */ slt $at, $v1, $a3 -/* B617C0 800EA620 10200003 */ beqz $at, .L800EA630 -/* B617C4 800EA624 00602825 */ move $a1, $v1 -/* B617C8 800EA628 10000001 */ b .L800EA630 -/* B617CC 800EA62C 00E02825 */ move $a1, $a3 -.L800EA630: -/* B617D0 800EA630 10800012 */ beqz $a0, .L800EA67C -/* B617D4 800EA634 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B617D8 800EA638 AFA60078 */ sw $a2, 0x78($sp) -/* B617DC 800EA63C AFA70020 */ sw $a3, 0x20($sp) -/* B617E0 800EA640 AFA8001C */ sw $t0, 0x1c($sp) -/* B617E4 800EA644 A3A9003F */ sb $t1, 0x3f($sp) -/* B617E8 800EA648 0C039D17 */ jal Audio_InstrumentGetAudioBankSound -/* B617EC 800EA64C AFAA0040 */ sw $t2, 0x40($sp) -/* B617F0 800EA650 8FA60078 */ lw $a2, 0x78($sp) -/* B617F4 800EA654 8FA70020 */ lw $a3, 0x20($sp) -/* B617F8 800EA658 8FA8001C */ lw $t0, 0x1c($sp) -/* B617FC 800EA65C 8CCD004C */ lw $t5, 0x4c($a2) -/* B61800 800EA660 93A9003F */ lbu $t1, 0x3f($sp) -/* B61804 800EA664 8FAA0040 */ lw $t2, 0x40($sp) -/* B61808 800EA668 ACC2004C */ sw $v0, 0x4c($a2) -/* B6180C 800EA66C 004D5826 */ xor $t3, $v0, $t5 -/* B61810 800EA670 2D6B0001 */ sltiu $t3, $t3, 1 -/* B61814 800EA674 10000013 */ b .L800EA6C4 -/* B61818 800EA678 C4400004 */ lwc1 $f0, 4($v0) -.L800EA67C: -/* B6181C 800EA67C 44810000 */ mtc1 $at, $f0 -/* B61820 800EA680 284100C0 */ slti $at, $v0, 0xc0 -/* B61824 800EA684 1420000F */ bnez $at, .L800EA6C4 -/* B61828 800EA688 ACC0004C */ sw $zero, 0x4c($a2) -/* B6182C 800EA68C 00027080 */ sll $t6, $v0, 2 -/* B61830 800EA690 01C27023 */ subu $t6, $t6, $v0 -/* B61834 800EA694 000E7080 */ sll $t6, $t6, 2 -/* B61838 800EA698 01C27023 */ subu $t6, $t6, $v0 -/* B6183C 800EA69C 000E70C0 */ sll $t6, $t6, 3 -/* B61840 800EA6A0 3C058017 */ lui $a1, %hi(gAudioContext) # $a1, 0x8017 -/* B61844 800EA6A4 01C27021 */ addu $t6, $t6, $v0 -/* B61848 800EA6A8 24A5F180 */ addiu $a1, %lo(gAudioContext) # addiu $a1, $a1, -0xe80 -/* B6184C 800EA6AC 000E70C0 */ sll $t6, $t6, 3 -/* B61850 800EA6B0 3C01FFFD */ lui $at, (0xFFFDEC98 >> 16) # lui $at, 0xfffd -/* B61854 800EA6B4 3421EC98 */ ori $at, (0xFFFDEC98 & 0xFFFF) # ori $at, $at, 0xec98 -/* B61858 800EA6B8 00AE7821 */ addu $t7, $a1, $t6 -/* B6185C 800EA6BC 01E1C021 */ addu $t8, $t7, $at -/* B61860 800EA6C0 ACD8004C */ sw $t8, 0x4c($a2) -.L800EA6C4: -/* B61864 800EA6C4 3C038013 */ lui $v1, %hi(D_8012F8B4) # $v1, 0x8013 -/* B61868 800EA6C8 90CD0005 */ lbu $t5, 5($a2) -/* B6186C 800EA6CC 2463F8B4 */ addiu $v1, %lo(D_8012F8B4) # addiu $v1, $v1, -0x74c -/* B61870 800EA6D0 0007C880 */ sll $t9, $a3, 2 -/* B61874 800EA6D4 00796021 */ addu $t4, $v1, $t9 -/* B61878 800EA6D8 C5880000 */ lwc1 $f8, ($t4) -/* B6187C 800EA6DC 91020000 */ lbu $v0, ($t0) -/* B61880 800EA6E0 000D7080 */ sll $t6, $t5, 2 -/* B61884 800EA6E4 006E7821 */ addu $t7, $v1, $t6 -/* B61888 800EA6E8 C5EA0000 */ lwc1 $f10, ($t7) -/* B6188C 800EA6EC 46004082 */ mul.s $f2, $f8, $f0 -/* B61890 800EA6F0 2404FF7F */ li $a0, -129 -/* B61894 800EA6F4 0044C024 */ and $t8, $v0, $a0 -/* B61898 800EA6F8 2719FFFF */ addiu $t9, $t8, -1 -/* B6189C 800EA6FC 3C058017 */ lui $a1, %hi(gAudioContext) # $a1, 0x8017 -/* B618A0 800EA700 2F210005 */ sltiu $at, $t9, 5 -/* B618A4 800EA704 46005382 */ mul.s $f14, $f10, $f0 -/* B618A8 800EA708 1020000D */ beqz $at, .L800EA740 -/* B618AC 800EA70C 24A5F180 */ addiu $a1, %lo(gAudioContext) # addiu $a1, $a1, -0xe80 -/* B618B0 800EA710 0019C880 */ sll $t9, $t9, 2 -/* B618B4 800EA714 3C018015 */ lui $at, %hi(jtbl_80149698) -/* B618B8 800EA718 00390821 */ addu $at, $at, $t9 -/* B618BC 800EA71C 8C399698 */ lw $t9, %lo(jtbl_80149698)($at) -/* B618C0 800EA720 03200008 */ jr $t9 -/* B618C4 800EA724 00000000 */ nop -glabel L800EA728 -/* B618C8 800EA728 46001006 */ mov.s $f0, $f2 -/* B618CC 800EA72C 10000006 */ b .L800EA748 -/* B618D0 800EA730 46007306 */ mov.s $f12, $f14 -glabel L800EA734 -/* B618D4 800EA734 46001306 */ mov.s $f12, $f2 -/* B618D8 800EA738 10000003 */ b .L800EA748 -/* B618DC 800EA73C 46007006 */ mov.s $f0, $f14 -.L800EA740: -/* B618E0 800EA740 46001306 */ mov.s $f12, $f2 -/* B618E4 800EA744 46001006 */ mov.s $f0, $f2 -.L800EA748: -/* B618E8 800EA748 460C0403 */ div.s $f16, $f0, $f12 -/* B618EC 800EA74C 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B618F0 800EA750 44819000 */ mtc1 $at, $f18 -/* B618F4 800EA754 304C0080 */ andi $t4, $v0, 0x80 -/* B618F8 800EA758 46128101 */ sub.s $f4, $f16, $f18 -/* B618FC 800EA75C 11800025 */ beqz $t4, .L800EA7F4 -/* B61900 800EA760 E5040008 */ swc1 $f4, 8($t0) -/* B61904 800EA764 954D0008 */ lhu $t5, 8($t2) -/* B61908 800EA768 84AF2898 */ lh $t7, 0x2898($a1) -/* B6190C 800EA76C 84C20008 */ lh $v0, 8($a2) -/* B61910 800EA770 000D73C0 */ sll $t6, $t5, 0xf -/* B61914 800EA774 01CF001A */ div $zero, $t6, $t7 -/* B61918 800EA778 00001812 */ mflo $v1 -/* B6191C 800EA77C 15E00002 */ bnez $t7, .L800EA788 -/* B61920 800EA780 00000000 */ nop -/* B61924 800EA784 0007000D */ break 7 -.L800EA788: -/* B61928 800EA788 2401FFFF */ li $at, -1 -/* B6192C 800EA78C 15E10004 */ bne $t7, $at, .L800EA7A0 -/* B61930 800EA790 3C018000 */ lui $at, 0x8000 -/* B61934 800EA794 15C10002 */ bne $t6, $at, .L800EA7A0 -/* B61938 800EA798 00000000 */ nop -/* B6193C 800EA79C 0006000D */ break 6 -.L800EA7A0: -/* B61940 800EA7A0 50400027 */ beql $v0, $zero, .L800EA840 -/* B61944 800EA7A4 28617FFF */ slti $at, $v1, 0x7fff -/* B61948 800EA7A8 94D9000E */ lhu $t9, 0xe($a2) -/* B6194C 800EA7AC 0003C200 */ sll $t8, $v1, 8 -/* B61950 800EA7B0 00590019 */ multu $v0, $t9 -/* B61954 800EA7B4 00006012 */ mflo $t4 -/* B61958 800EA7B8 00000000 */ nop -/* B6195C 800EA7BC 00000000 */ nop -/* B61960 800EA7C0 030C001A */ div $zero, $t8, $t4 -/* B61964 800EA7C4 00001812 */ mflo $v1 -/* B61968 800EA7C8 15800002 */ bnez $t4, .L800EA7D4 -/* B6196C 800EA7CC 00000000 */ nop -/* B61970 800EA7D0 0007000D */ break 7 -.L800EA7D4: -/* B61974 800EA7D4 2401FFFF */ li $at, -1 -/* B61978 800EA7D8 15810004 */ bne $t4, $at, .L800EA7EC -/* B6197C 800EA7DC 3C018000 */ lui $at, 0x8000 -/* B61980 800EA7E0 17010002 */ bne $t8, $at, .L800EA7EC -/* B61984 800EA7E4 00000000 */ nop -/* B61988 800EA7E8 0006000D */ break 6 -.L800EA7EC: -/* B6198C 800EA7EC 10000014 */ b .L800EA840 -/* B61990 800EA7F0 28617FFF */ slti $at, $v1, 0x7fff -.L800EA7F4: -/* B61994 800EA7F4 94CD000E */ lhu $t5, 0xe($a2) -/* B61998 800EA7F8 84AE2854 */ lh $t6, 0x2854($a1) -/* B6199C 800EA7FC 3C190002 */ lui $t9, 2 -/* B619A0 800EA800 01AE0019 */ multu $t5, $t6 -/* B619A4 800EA804 00007812 */ mflo $t7 -/* B619A8 800EA808 00000000 */ nop -/* B619AC 800EA80C 00000000 */ nop -/* B619B0 800EA810 032F001A */ div $zero, $t9, $t7 -/* B619B4 800EA814 00001812 */ mflo $v1 -/* B619B8 800EA818 15E00002 */ bnez $t7, .L800EA824 -/* B619BC 800EA81C 00000000 */ nop -/* B619C0 800EA820 0007000D */ break 7 -.L800EA824: -/* B619C4 800EA824 2401FFFF */ li $at, -1 -/* B619C8 800EA828 15E10004 */ bne $t7, $at, .L800EA83C -/* B619CC 800EA82C 3C018000 */ lui $at, 0x8000 -/* B619D0 800EA830 17210002 */ bne $t9, $at, .L800EA83C -/* B619D4 800EA834 00000000 */ nop -/* B619D8 800EA838 0006000D */ break 6 -.L800EA83C: -/* B619DC 800EA83C 28617FFF */ slti $at, $v1, 0x7fff -.L800EA840: -/* B619E0 800EA840 14200003 */ bnez $at, .L800EA850 -/* B619E4 800EA844 00000000 */ nop -/* B619E8 800EA848 10000004 */ b .L800EA85C -/* B619EC 800EA84C 24037FFF */ li $v1, 32767 -.L800EA850: -/* B619F0 800EA850 5C600003 */ bgtzl $v1, .L800EA860 -/* B619F4 800EA854 A5030004 */ sh $v1, 4($t0) -/* B619F8 800EA858 24030001 */ li $v1, 1 -.L800EA85C: -/* B619FC 800EA85C A5030004 */ sh $v1, 4($t0) -.L800EA860: -/* B61A00 800EA860 A5000002 */ sh $zero, 2($t0) -/* B61A04 800EA864 E4CC0030 */ swc1 $f12, 0x30($a2) -/* B61A08 800EA868 91180000 */ lbu $t8, ($t0) -/* B61A0C 800EA86C 24010005 */ li $at, 5 -/* B61A10 800EA870 03046024 */ and $t4, $t8, $a0 -/* B61A14 800EA874 55810033 */ bnel $t4, $at, .L800EA944 -/* B61A18 800EA878 C4D20030 */ lwc1 $f18, 0x30($a2) -/* B61A1C 800EA87C 10000030 */ b .L800EA940 -/* B61A20 800EA880 A0C90005 */ sb $t1, 5($a2) -.L800EA884: -/* B61A24 800EA884 10800015 */ beqz $a0, .L800EA8DC -/* B61A28 800EA888 00E02825 */ move $a1, $a3 -/* B61A2C 800EA88C AFA60078 */ sw $a2, 0x78($sp) -/* B61A30 800EA890 AFA70020 */ sw $a3, 0x20($sp) -/* B61A34 800EA894 0C039D17 */ jal Audio_InstrumentGetAudioBankSound -/* B61A38 800EA898 AFAA0040 */ sw $t2, 0x40($sp) -/* B61A3C 800EA89C 8FA60078 */ lw $a2, 0x78($sp) -/* B61A40 800EA8A0 8FA70020 */ lw $a3, 0x20($sp) -/* B61A44 800EA8A4 3C038013 */ lui $v1, %hi(D_8012F8B4) # $v1, 0x8013 -/* B61A48 800EA8A8 8CCD004C */ lw $t5, 0x4c($a2) -/* B61A4C 800EA8AC 8FAA0040 */ lw $t2, 0x40($sp) -/* B61A50 800EA8B0 2463F8B4 */ addiu $v1, %lo(D_8012F8B4) # addiu $v1, $v1, -0x74c -/* B61A54 800EA8B4 ACC2004C */ sw $v0, 0x4c($a2) -/* B61A58 800EA8B8 00077080 */ sll $t6, $a3, 2 -/* B61A5C 800EA8BC 006EC821 */ addu $t9, $v1, $t6 -/* B61A60 800EA8C0 C7260000 */ lwc1 $f6, ($t9) -/* B61A64 800EA8C4 C4480004 */ lwc1 $f8, 4($v0) -/* B61A68 800EA8C8 004D5826 */ xor $t3, $v0, $t5 -/* B61A6C 800EA8CC 2D6B0001 */ sltiu $t3, $t3, 1 -/* B61A70 800EA8D0 46083282 */ mul.s $f10, $f6, $f8 -/* B61A74 800EA8D4 10000018 */ b .L800EA938 -/* B61A78 800EA8D8 E4CA0030 */ swc1 $f10, 0x30($a2) -.L800EA8DC: -/* B61A7C 800EA8DC 3C038013 */ lui $v1, %hi(D_8012F8B4) # $v1, 0x8013 -/* B61A80 800EA8E0 2463F8B4 */ addiu $v1, %lo(D_8012F8B4) # addiu $v1, $v1, -0x74c -/* B61A84 800EA8E4 00077880 */ sll $t7, $a3, 2 -/* B61A88 800EA8E8 ACC0004C */ sw $zero, 0x4c($a2) -/* B61A8C 800EA8EC 006FC021 */ addu $t8, $v1, $t7 -/* B61A90 800EA8F0 C7100000 */ lwc1 $f16, ($t8) -/* B61A94 800EA8F4 284100C0 */ slti $at, $v0, 0xc0 -/* B61A98 800EA8F8 1420000F */ bnez $at, .L800EA938 -/* B61A9C 800EA8FC E4D00030 */ swc1 $f16, 0x30($a2) -/* B61AA0 800EA900 00026080 */ sll $t4, $v0, 2 -/* B61AA4 800EA904 01826023 */ subu $t4, $t4, $v0 -/* B61AA8 800EA908 000C6080 */ sll $t4, $t4, 2 -/* B61AAC 800EA90C 01826023 */ subu $t4, $t4, $v0 -/* B61AB0 800EA910 000C60C0 */ sll $t4, $t4, 3 -/* B61AB4 800EA914 3C058017 */ lui $a1, %hi(gAudioContext) # $a1, 0x8017 -/* B61AB8 800EA918 01826021 */ addu $t4, $t4, $v0 -/* B61ABC 800EA91C 24A5F180 */ addiu $a1, %lo(gAudioContext) # addiu $a1, $a1, -0xe80 -/* B61AC0 800EA920 000C60C0 */ sll $t4, $t4, 3 -/* B61AC4 800EA924 3C01FFFD */ li $at, 0xFFFD0000 # 0.000000 -/* B61AC8 800EA928 3421EC98 */ ori $at, (0xFFFDEC98 & 0xFFFF) # ori $at, $at, 0xec98 -/* B61ACC 800EA92C 00AC6821 */ addu $t5, $a1, $t4 -/* B61AD0 800EA930 01A17021 */ addu $t6, $t5, $at -/* B61AD4 800EA934 ACCE004C */ sw $t6, 0x4c($a2) -.L800EA938: -/* B61AD8 800EA938 3C058017 */ lui $a1, %hi(gAudioContext) -/* B61ADC 800EA93C 24A5F180 */ addiu $a1, %lo(gAudioContext) # addiu $a1, $a1, -0xe80 -.L800EA940: -/* B61AE0 800EA940 C4D20030 */ lwc1 $f18, 0x30($a2) -.L800EA944: -/* B61AE4 800EA944 C4C40034 */ lwc1 $f4, 0x34($a2) -/* B61AE8 800EA948 84C20008 */ lh $v0, 8($a2) -/* B61AEC 800EA94C 46049182 */ mul.s $f6, $f18, $f4 -/* B61AF0 800EA950 A4C2000C */ sh $v0, 0xc($a2) -/* B61AF4 800EA954 1440005D */ bnez $v0, .L800EAACC -/* B61AF8 800EA958 E4C60030 */ swc1 $f6, 0x30($a2) -/* B61AFC 800EA95C 8CC2004C */ lw $v0, 0x4c($a2) -/* B61B00 800EA960 5040000E */ beql $v0, $zero, .L800EA99C -/* B61B04 800EA964 44800000 */ mtc1 $zero, $f0 -/* B61B08 800EA968 8C590000 */ lw $t9, ($v0) -/* B61B0C 800EA96C 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* B61B10 800EA970 8F2F0008 */ lw $t7, 8($t9) -/* B61B14 800EA974 8DF80004 */ lw $t8, 4($t7) -/* B61B18 800EA978 44984000 */ mtc1 $t8, $f8 -/* B61B1C 800EA97C 07010008 */ bgez $t8, .L800EA9A0 -/* B61B20 800EA980 46804020 */ cvt.s.w $f0, $f8 -/* B61B24 800EA984 44815000 */ mtc1 $at, $f10 -/* B61B28 800EA988 00000000 */ nop -/* B61B2C 800EA98C 460A0000 */ add.s $f0, $f0, $f10 -/* B61B30 800EA990 10000004 */ b .L800EA9A4 -/* B61B34 800EA994 954C0008 */ lhu $t4, 8($t2) -/* B61B38 800EA998 44800000 */ mtc1 $zero, $f0 -.L800EA99C: -/* B61B3C 800EA99C 00000000 */ nop -.L800EA9A0: -/* B61B40 800EA9A0 954C0008 */ lhu $t4, 8($t2) -.L800EA9A4: -/* B61B44 800EA9A4 3C018015 */ lui $at, %hi(D_801496AC) -/* B61B48 800EA9A8 C42296AC */ lwc1 $f2, %lo(D_801496AC)($at) -/* B61B4C 800EA9AC 448C8000 */ mtc1 $t4, $f16 -/* B61B50 800EA9B0 05810005 */ bgez $t4, .L800EA9C8 -/* B61B54 800EA9B4 468084A0 */ cvt.s.w $f18, $f16 -/* B61B58 800EA9B8 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* B61B5C 800EA9BC 44812000 */ mtc1 $at, $f4 -/* B61B60 800EA9C0 00000000 */ nop -/* B61B64 800EA9C4 46049480 */ add.s $f18, $f18, $f4 -.L800EA9C8: -/* B61B68 800EA9C8 46120002 */ mul.s $f0, $f0, $f18 -/* B61B6C 800EA9CC C4A62870 */ lwc1 $f6, 0x2870($a1) -/* B61B70 800EA9D0 C4C80030 */ lwc1 $f8, 0x30($a2) -/* B61B74 800EA9D4 46060002 */ mul.s $f0, $f0, $f6 -/* B61B78 800EA9D8 46080003 */ div.s $f0, $f0, $f8 -/* B61B7C 800EA9DC 4600103C */ c.lt.s $f2, $f0 -/* B61B80 800EA9E0 00000000 */ nop -/* B61B84 800EA9E4 45020003 */ bc1fl .L800EA9F4 -/* B61B88 800EA9E8 4600028D */ trunc.w.s $f10, $f0 -/* B61B8C 800EA9EC 46001006 */ mov.s $f0, $f2 -/* B61B90 800EA9F0 4600028D */ trunc.w.s $f10, $f0 -.L800EA9F4: -/* B61B94 800EA9F4 90D80020 */ lbu $t8, 0x20($a2) -/* B61B98 800EA9F8 A4C0000A */ sh $zero, 0xa($a2) -/* B61B9C 800EA9FC 44195000 */ mfc1 $t9, $f10 -/* B61BA0 800EAA00 00000000 */ nop -/* B61BA4 800EAA04 272F0001 */ addiu $t7, $t9, 1 -/* B61BA8 800EAA08 13000030 */ beqz $t8, .L800EAACC -/* B61BAC 800EAA0C A4CF0008 */ sh $t7, 8($a2) -/* B61BB0 800EAA10 8FAC0060 */ lw $t4, 0x60($sp) -/* B61BB4 800EAA14 918D0000 */ lbu $t5, ($t4) -/* B61BB8 800EAA18 31AE0080 */ andi $t6, $t5, 0x80 -/* B61BBC 800EAA1C 51C0002C */ beql $t6, $zero, .L800EAAD0 -/* B61BC0 800EAA20 01601025 */ move $v0, $t3 -/* B61BC4 800EAA24 95590008 */ lhu $t9, 8($t2) -/* B61BC8 800EAA28 84B82898 */ lh $t8, 0x2898($a1) -/* B61BCC 800EAA2C 84CC0008 */ lh $t4, 8($a2) -/* B61BD0 800EAA30 00197BC0 */ sll $t7, $t9, 0xf -/* B61BD4 800EAA34 01F8001A */ div $zero, $t7, $t8 -/* B61BD8 800EAA38 00001012 */ mflo $v0 -/* B61BDC 800EAA3C 94CD000E */ lhu $t5, 0xe($a2) -/* B61BE0 800EAA40 0002CA00 */ sll $t9, $v0, 8 -/* B61BE4 800EAA44 17000002 */ bnez $t8, .L800EAA50 -/* B61BE8 800EAA48 00000000 */ nop -/* B61BEC 800EAA4C 0007000D */ break 7 -.L800EAA50: -/* B61BF0 800EAA50 2401FFFF */ li $at, -1 -/* B61BF4 800EAA54 17010004 */ bne $t8, $at, .L800EAA68 -/* B61BF8 800EAA58 3C018000 */ lui $at, 0x8000 -/* B61BFC 800EAA5C 15E10002 */ bne $t7, $at, .L800EAA68 -/* B61C00 800EAA60 00000000 */ nop -/* B61C04 800EAA64 0006000D */ break 6 -.L800EAA68: -/* B61C08 800EAA68 018D0019 */ multu $t4, $t5 -/* B61C0C 800EAA6C 8FAF0060 */ lw $t7, 0x60($sp) -/* B61C10 800EAA70 00007012 */ mflo $t6 -/* B61C14 800EAA74 00000000 */ nop -/* B61C18 800EAA78 00000000 */ nop -/* B61C1C 800EAA7C 032E001A */ div $zero, $t9, $t6 -/* B61C20 800EAA80 15C00002 */ bnez $t6, .L800EAA8C -/* B61C24 800EAA84 00000000 */ nop -/* B61C28 800EAA88 0007000D */ break 7 -.L800EAA8C: -/* B61C2C 800EAA8C 2401FFFF */ li $at, -1 -/* B61C30 800EAA90 15C10004 */ bne $t6, $at, .L800EAAA4 -/* B61C34 800EAA94 3C018000 */ lui $at, 0x8000 -/* B61C38 800EAA98 17210002 */ bne $t9, $at, .L800EAAA4 -/* B61C3C 800EAA9C 00000000 */ nop -/* B61C40 800EAAA0 0006000D */ break 6 -.L800EAAA4: -/* B61C44 800EAAA4 00001012 */ mflo $v0 -/* B61C48 800EAAA8 28417FFF */ slti $at, $v0, 0x7fff -/* B61C4C 800EAAAC 14200003 */ bnez $at, .L800EAABC -/* B61C50 800EAAB0 00000000 */ nop -/* B61C54 800EAAB4 10000004 */ b .L800EAAC8 -/* B61C58 800EAAB8 24027FFF */ li $v0, 32767 -.L800EAABC: -/* B61C5C 800EAABC 5C400003 */ bgtzl $v0, .L800EAACC -/* B61C60 800EAAC0 A5E20004 */ sh $v0, 4($t7) -/* B61C64 800EAAC4 24020001 */ li $v0, 1 -.L800EAAC8: -/* B61C68 800EAAC8 A5E20004 */ sh $v0, 4($t7) -.L800EAACC: -/* B61C6C 800EAACC 01601025 */ move $v0, $t3 -.L800EAAD0: -/* B61C70 800EAAD0 8FBF0014 */ lw $ra, 0x14($sp) -/* B61C74 800EAAD4 27BD0078 */ addiu $sp, $sp, 0x78 -/* B61C78 800EAAD8 03E00008 */ jr $ra -/* B61C7C 800EAADC 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800EAAE0.s b/asm/non_matchings/code/audio_seqplayer/func_800EAAE0.s deleted file mode 100644 index ed37be7a71..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800EAAE0.s +++ /dev/null @@ -1,298 +0,0 @@ -.late_rodata -glabel D_801496B0 - .float 16129 - -.text -glabel func_800EAAE0 -/* B61C80 800EAAE0 27BDFFC0 */ addiu $sp, $sp, -0x40 -/* B61C84 800EAAE4 AFBF0014 */ sw $ra, 0x14($sp) -/* B61C88 800EAAE8 AFA50044 */ sw $a1, 0x44($sp) -/* B61C8C 800EAAEC 8C880050 */ lw $t0, 0x50($a0) -/* B61C90 800EAAF0 240100C0 */ li $at, 192 -/* B61C94 800EAAF4 00803025 */ move $a2, $a0 -/* B61C98 800EAAF8 8D0E004C */ lw $t6, 0x4c($t0) -/* B61C9C 800EAAFC 14A1000D */ bne $a1, $at, .L800EAB34 -/* B61CA0 800EAB00 AFAE002C */ sw $t6, 0x2c($sp) -/* B61CA4 800EAB04 24C40054 */ addiu $a0, $a2, 0x54 -/* B61CA8 800EAB08 0C03A765 */ jal func_800E9D94 -/* B61CAC 800EAB0C AFA60040 */ sw $a2, 0x40($sp) -/* B61CB0 800EAB10 8FA60040 */ lw $a2, 0x40($sp) -/* B61CB4 800EAB14 90D90000 */ lbu $t9, ($a2) -/* B61CB8 800EAB18 A4C20008 */ sh $v0, 8($a2) -/* B61CBC 800EAB1C 2402FFFF */ li $v0, -1 -/* B61CC0 800EAB20 372A0020 */ ori $t2, $t9, 0x20 -/* B61CC4 800EAB24 314B00FD */ andi $t3, $t2, 0xfd -/* B61CC8 800EAB28 A0CA0000 */ sb $t2, ($a2) -/* B61CCC 800EAB2C 100000ED */ b .L800EAEE4 -/* B61CD0 800EAB30 A0CB0000 */ sb $t3, ($a2) -.L800EAB34: -/* B61CD4 800EAB34 90CC0000 */ lbu $t4, ($a2) -/* B61CD8 800EAB38 24010001 */ li $at, 1 -/* B61CDC 800EAB3C 318DFFDF */ andi $t5, $t4, 0xffdf -/* B61CE0 800EAB40 A0CD0000 */ sb $t5, ($a2) -/* B61CE4 800EAB44 8D0E0000 */ lw $t6, ($t0) -/* B61CE8 800EAB48 8FA50044 */ lw $a1, 0x44($sp) -/* B61CEC 800EAB4C 000E7980 */ sll $t7, $t6, 6 -/* B61CF0 800EAB50 000FC7C2 */ srl $t8, $t7, 0x1f -/* B61CF4 800EAB54 17010053 */ bne $t8, $at, .L800EACA4 -/* B61CF8 800EAB58 30A500C0 */ andi $a1, $a1, 0xc0 -/* B61CFC 800EAB5C 8FA50044 */ lw $a1, 0x44($sp) -/* B61D00 800EAB60 24010040 */ li $at, 64 -/* B61D04 800EAB64 30A500C0 */ andi $a1, $a1, 0xc0 -/* B61D08 800EAB68 50A00008 */ beql $a1, $zero, .L800EAB8C -/* B61D0C 800EAB6C 24C40054 */ addiu $a0, $a2, 0x54 -/* B61D10 800EAB70 10A1001C */ beq $a1, $at, .L800EABE4 -/* B61D14 800EAB74 24010080 */ li $at, 128 -/* B61D18 800EAB78 50A1002D */ beql $a1, $at, .L800EAC30 -/* B61D1C 800EAB7C 84CE0014 */ lh $t6, 0x14($a2) -/* B61D20 800EAB80 10000037 */ b .L800EAC60 -/* B61D24 800EAB84 8FA70034 */ lw $a3, 0x34($sp) -/* B61D28 800EAB88 24C40054 */ addiu $a0, $a2, 0x54 -.L800EAB8C: -/* B61D2C 800EAB8C AFA4001C */ sw $a0, 0x1c($sp) -/* B61D30 800EAB90 AFA50018 */ sw $a1, 0x18($sp) -/* B61D34 800EAB94 AFA60040 */ sw $a2, 0x40($sp) -/* B61D38 800EAB98 0C03A765 */ jal func_800E9D94 -/* B61D3C 800EAB9C AFA80030 */ sw $t0, 0x30($sp) -/* B61D40 800EABA0 8FA4001C */ lw $a0, 0x1c($sp) -/* B61D44 800EABA4 A7A2003A */ sh $v0, 0x3a($sp) -/* B61D48 800EABA8 8FA60040 */ lw $a2, 0x40($sp) -/* B61D4C 800EABAC 8C830000 */ lw $v1, ($a0) -/* B61D50 800EABB0 8FA50018 */ lw $a1, 0x18($sp) -/* B61D54 800EABB4 8FA80030 */ lw $t0, 0x30($sp) -/* B61D58 800EABB8 90670000 */ lbu $a3, ($v1) -/* B61D5C 800EABBC 24790001 */ addiu $t9, $v1, 1 -/* B61D60 800EABC0 AC990000 */ sw $t9, ($a0) -/* B61D64 800EABC4 932A0000 */ lbu $t2, ($t9) -/* B61D68 800EABC8 03204825 */ move $t1, $t9 -/* B61D6C 800EABCC A0CA0003 */ sb $t2, 3($a2) -/* B61D70 800EABD0 8C8B0000 */ lw $t3, ($a0) -/* B61D74 800EABD4 256C0001 */ addiu $t4, $t3, 1 -/* B61D78 800EABD8 AC8C0000 */ sw $t4, ($a0) -/* B61D7C 800EABDC 10000020 */ b .L800EAC60 -/* B61D80 800EABE0 A4C20014 */ sh $v0, 0x14($a2) -.L800EABE4: -/* B61D84 800EABE4 24C40054 */ addiu $a0, $a2, 0x54 -/* B61D88 800EABE8 AFA4001C */ sw $a0, 0x1c($sp) -/* B61D8C 800EABEC AFA50018 */ sw $a1, 0x18($sp) -/* B61D90 800EABF0 AFA60040 */ sw $a2, 0x40($sp) -/* B61D94 800EABF4 0C03A765 */ jal func_800E9D94 -/* B61D98 800EABF8 AFA80030 */ sw $t0, 0x30($sp) -/* B61D9C 800EABFC 8FA4001C */ lw $a0, 0x1c($sp) -/* B61DA0 800EAC00 A7A2003A */ sh $v0, 0x3a($sp) -/* B61DA4 800EAC04 8FA60040 */ lw $a2, 0x40($sp) -/* B61DA8 800EAC08 8C830000 */ lw $v1, ($a0) -/* B61DAC 800EAC0C 8FA50018 */ lw $a1, 0x18($sp) -/* B61DB0 800EAC10 8FA80030 */ lw $t0, 0x30($sp) -/* B61DB4 800EAC14 90670000 */ lbu $a3, ($v1) -/* B61DB8 800EAC18 246D0001 */ addiu $t5, $v1, 1 -/* B61DBC 800EAC1C AC8D0000 */ sw $t5, ($a0) -/* B61DC0 800EAC20 A0C00003 */ sb $zero, 3($a2) -/* B61DC4 800EAC24 1000000E */ b .L800EAC60 -/* B61DC8 800EAC28 A4C20014 */ sh $v0, 0x14($a2) -/* B61DCC 800EAC2C 84CE0014 */ lh $t6, 0x14($a2) -.L800EAC30: -/* B61DD0 800EAC30 24C40054 */ addiu $a0, $a2, 0x54 -/* B61DD4 800EAC34 A7AE003A */ sh $t6, 0x3a($sp) -/* B61DD8 800EAC38 8C830000 */ lw $v1, ($a0) -/* B61DDC 800EAC3C 90670000 */ lbu $a3, ($v1) -/* B61DE0 800EAC40 246F0001 */ addiu $t7, $v1, 1 -/* B61DE4 800EAC44 AC8F0000 */ sw $t7, ($a0) -/* B61DE8 800EAC48 91F90000 */ lbu $t9, ($t7) -/* B61DEC 800EAC4C 01E0C025 */ move $t8, $t7 -/* B61DF0 800EAC50 A0D90003 */ sb $t9, 3($a2) -/* B61DF4 800EAC54 8C890000 */ lw $t1, ($a0) -/* B61DF8 800EAC58 252A0001 */ addiu $t2, $t1, 1 -/* B61DFC 800EAC5C AC8A0000 */ sw $t2, ($a0) -.L800EAC60: -/* B61E00 800EAC60 28E10080 */ slti $at, $a3, 0x80 -/* B61E04 800EAC64 50200004 */ beql $at, $zero, .L800EAC78 -/* B61E08 800EAC68 2407007F */ li $a3, 127 -/* B61E0C 800EAC6C 04E30003 */ bgezl $a3, .L800EAC7C -/* B61E10 800EAC70 44872000 */ mtc1 $a3, $f4 -/* B61E14 800EAC74 2407007F */ li $a3, 127 -.L800EAC78: -/* B61E18 800EAC78 44872000 */ mtc1 $a3, $f4 -.L800EAC7C: -/* B61E1C 800EAC7C 3C018015 */ lui $at, %hi(D_801496B0) -/* B61E20 800EAC80 C42896B0 */ lwc1 $f8, %lo(D_801496B0)($at) -/* B61E24 800EAC84 46802020 */ cvt.s.w $f0, $f4 -/* B61E28 800EAC88 46000182 */ mul.s $f6, $f0, $f0 -/* B61E2C 800EAC8C 46083283 */ div.s $f10, $f6, $f8 -/* B61E30 800EAC90 E4CA003C */ swc1 $f10, 0x3c($a2) -/* B61E34 800EAC94 8FAB0044 */ lw $t3, 0x44($sp) -/* B61E38 800EAC98 01656023 */ subu $t4, $t3, $a1 -/* B61E3C 800EAC9C 1000001D */ b .L800EAD14 -/* B61E40 800EACA0 AFAC0044 */ sw $t4, 0x44($sp) -.L800EACA4: -/* B61E44 800EACA4 10A00008 */ beqz $a1, .L800EACC8 -/* B61E48 800EACA8 24010040 */ li $at, 64 -/* B61E4C 800EACAC 50A10012 */ beql $a1, $at, .L800EACF8 -/* B61E50 800EACB0 84CD0012 */ lh $t5, 0x12($a2) -/* B61E54 800EACB4 24010080 */ li $at, 128 -/* B61E58 800EACB8 50A10012 */ beql $a1, $at, .L800EAD04 -/* B61E5C 800EACBC 84CE0014 */ lh $t6, 0x14($a2) -/* B61E60 800EACC0 10000012 */ b .L800EAD0C -/* B61E64 800EACC4 8FAF0044 */ lw $t7, 0x44($sp) -.L800EACC8: -/* B61E68 800EACC8 24C40054 */ addiu $a0, $a2, 0x54 -/* B61E6C 800EACCC AFA50018 */ sw $a1, 0x18($sp) -/* B61E70 800EACD0 AFA60040 */ sw $a2, 0x40($sp) -/* B61E74 800EACD4 0C03A765 */ jal func_800E9D94 -/* B61E78 800EACD8 AFA80030 */ sw $t0, 0x30($sp) -/* B61E7C 800EACDC 8FA60040 */ lw $a2, 0x40($sp) -/* B61E80 800EACE0 8FA50018 */ lw $a1, 0x18($sp) -/* B61E84 800EACE4 8FA80030 */ lw $t0, 0x30($sp) -/* B61E88 800EACE8 A7A2003A */ sh $v0, 0x3a($sp) -/* B61E8C 800EACEC 10000006 */ b .L800EAD08 -/* B61E90 800EACF0 A4C20014 */ sh $v0, 0x14($a2) -/* B61E94 800EACF4 84CD0012 */ lh $t5, 0x12($a2) -.L800EACF8: -/* B61E98 800EACF8 10000003 */ b .L800EAD08 -/* B61E9C 800EACFC A7AD003A */ sh $t5, 0x3a($sp) -/* B61EA0 800EAD00 84CE0014 */ lh $t6, 0x14($a2) -.L800EAD04: -/* B61EA4 800EAD04 A7AE003A */ sh $t6, 0x3a($sp) -.L800EAD08: -/* B61EA8 800EAD08 8FAF0044 */ lw $t7, 0x44($sp) -.L800EAD0C: -/* B61EAC 800EAD0C 01E5C023 */ subu $t8, $t7, $a1 -/* B61EB0 800EAD10 AFB80044 */ sw $t8, 0x44($sp) -.L800EAD14: -/* B61EB4 800EAD14 9103000D */ lbu $v1, 0xd($t0) -/* B61EB8 800EAD18 3C028017 */ lui $v0, %hi(D_80171AFC) -/* B61EBC 800EAD1C 5060002A */ beql $v1, $zero, .L800EADC8 -/* B61EC0 800EAD20 C4D0003C */ lwc1 $f16, 0x3c($a2) -/* B61EC4 800EAD24 8C421AFC */ lw $v0, %lo(D_80171AFC)($v0) -/* B61EC8 800EAD28 C4CC003C */ lwc1 $f12, 0x3c($a2) -/* B61ECC 800EAD2C 3C014F80 */ li $at, 0x4F800000 # 0.000000 -/* B61ED0 800EAD30 0043001B */ divu $zero, $v0, $v1 -/* B61ED4 800EAD34 0000C810 */ mfhi $t9 -/* B61ED8 800EAD38 44998000 */ mtc1 $t9, $f16 -/* B61EDC 800EAD3C 14600002 */ bnez $v1, .L800EAD48 -/* B61EE0 800EAD40 00000000 */ nop -/* B61EE4 800EAD44 0007000D */ break 7 -.L800EAD48: -/* B61EE8 800EAD48 468084A0 */ cvt.s.w $f18, $f16 -/* B61EEC 800EAD4C 07210004 */ bgez $t9, .L800EAD60 -/* B61EF0 800EAD50 00000000 */ nop -/* B61EF4 800EAD54 44812000 */ mtc1 $at, $f4 -/* B61EF8 800EAD58 00000000 */ nop -/* B61EFC 800EAD5C 46049480 */ add.s $f18, $f18, $f4 -.L800EAD60: -/* B61F00 800EAD60 46126182 */ mul.s $f6, $f12, $f18 -/* B61F04 800EAD64 3C0142C8 */ li $at, 0x42C80000 # 0.000000 -/* B61F08 800EAD68 44814000 */ mtc1 $at, $f8 -/* B61F0C 800EAD6C 30498000 */ andi $t1, $v0, 0x8000 -/* B61F10 800EAD70 11200002 */ beqz $t1, .L800EAD7C -/* B61F14 800EAD74 46083083 */ div.s $f2, $f6, $f8 -/* B61F18 800EAD78 46001087 */ neg.s $f2, $f2 -.L800EAD7C: -/* B61F1C 800EAD7C 46026000 */ add.s $f0, $f12, $f2 -/* B61F20 800EAD80 44807000 */ mtc1 $zero, $f14 -/* B61F24 800EAD84 00000000 */ nop -/* B61F28 800EAD88 460E003C */ c.lt.s $f0, $f14 -/* B61F2C 800EAD8C E4C00038 */ swc1 $f0, 0x38($a2) -/* B61F30 800EAD90 45020004 */ bc1fl .L800EADA4 -/* B61F34 800EAD94 3C013F80 */ lui $at, 0x3f80 -/* B61F38 800EAD98 1000000C */ b .L800EADCC -/* B61F3C 800EAD9C E4CE0038 */ swc1 $f14, 0x38($a2) -/* B61F40 800EADA0 3C013F80 */ li $at, 0x3F800000 # 0.000000 -.L800EADA4: -/* B61F44 800EADA4 44810000 */ mtc1 $at, $f0 -/* B61F48 800EADA8 C4CA0038 */ lwc1 $f10, 0x38($a2) -/* B61F4C 800EADAC 460A003C */ c.lt.s $f0, $f10 -/* B61F50 800EADB0 00000000 */ nop -/* B61F54 800EADB4 45020006 */ bc1fl .L800EADD0 -/* B61F58 800EADB8 97A2003A */ lhu $v0, 0x3a($sp) -/* B61F5C 800EADBC 10000003 */ b .L800EADCC -/* B61F60 800EADC0 E4C00038 */ swc1 $f0, 0x38($a2) -/* B61F64 800EADC4 C4D0003C */ lwc1 $f16, 0x3c($a2) -.L800EADC8: -/* B61F68 800EADC8 E4D00038 */ swc1 $f16, 0x38($a2) -.L800EADCC: -/* B61F6C 800EADCC 97A2003A */ lhu $v0, 0x3a($sp) -.L800EADD0: -/* B61F70 800EADD0 90CA0003 */ lbu $t2, 3($a2) -/* B61F74 800EADD4 A4C20008 */ sh $v0, 8($a2) -/* B61F78 800EADD8 01420019 */ multu $t2, $v0 -/* B61F7C 800EADDC 3C028017 */ lui $v0, %hi(D_80171AFC) # $v0, 0x8017 -/* B61F80 800EADE0 00005812 */ mflo $t3 -/* B61F84 800EADE4 000B6203 */ sra $t4, $t3, 8 -/* B61F88 800EADE8 A4CC000A */ sh $t4, 0xa($a2) -/* B61F8C 800EADEC 910D000E */ lbu $t5, 0xe($t0) -/* B61F90 800EADF0 51A00021 */ beql $t5, $zero, .L800EAE78 -/* B61F94 800EADF4 8FA9002C */ lw $t1, 0x2c($sp) -/* B61F98 800EADF8 8C421AFC */ lw $v0, %lo(D_80171AFC)($v0) -/* B61F9C 800EADFC 910E000D */ lbu $t6, 0xd($t0) -/* B61FA0 800EAE00 84C3000A */ lh $v1, 0xa($a2) -/* B61FA4 800EAE04 24010064 */ li $at, 100 -/* B61FA8 800EAE08 004E001B */ divu $zero, $v0, $t6 -/* B61FAC 800EAE0C 00007810 */ mfhi $t7 -/* B61FB0 800EAE10 30584000 */ andi $t8, $v0, 0x4000 -/* B61FB4 800EAE14 15C00002 */ bnez $t6, .L800EAE20 -/* B61FB8 800EAE18 00000000 */ nop -/* B61FBC 800EAE1C 0007000D */ break 7 -.L800EAE20: -/* B61FC0 800EAE20 006F0019 */ multu $v1, $t7 -/* B61FC4 800EAE24 00002012 */ mflo $a0 -/* B61FC8 800EAE28 00000000 */ nop -/* B61FCC 800EAE2C 00000000 */ nop -/* B61FD0 800EAE30 0081001B */ divu $zero, $a0, $at -/* B61FD4 800EAE34 00002012 */ mflo $a0 -/* B61FD8 800EAE38 53000003 */ beql $t8, $zero, .L800EAE48 -/* B61FDC 800EAE3C 0064C821 */ addu $t9, $v1, $a0 -/* B61FE0 800EAE40 00042023 */ negu $a0, $a0 -/* B61FE4 800EAE44 0064C821 */ addu $t9, $v1, $a0 -.L800EAE48: -/* B61FE8 800EAE48 A4D9000A */ sh $t9, 0xa($a2) -/* B61FEC 800EAE4C 84C3000A */ lh $v1, 0xa($a2) -/* B61FF0 800EAE50 04630004 */ bgezl $v1, .L800EAE64 -/* B61FF4 800EAE54 84C20008 */ lh $v0, 8($a2) -/* B61FF8 800EAE58 10000006 */ b .L800EAE74 -/* B61FFC 800EAE5C A4C0000A */ sh $zero, 0xa($a2) -/* B62000 800EAE60 84C20008 */ lh $v0, 8($a2) -.L800EAE64: -/* B62004 800EAE64 0043082A */ slt $at, $v0, $v1 -/* B62008 800EAE68 50200003 */ beql $at, $zero, .L800EAE78 -/* B6200C 800EAE6C 8FA9002C */ lw $t1, 0x2c($sp) -/* B62010 800EAE70 A4C2000A */ sh $v0, 0xa($a2) -.L800EAE74: -/* B62014 800EAE74 8FA9002C */ lw $t1, 0x2c($sp) -.L800EAE78: -/* B62018 800EAE78 8D2A0000 */ lw $t2, ($t1) -/* B6201C 800EAE7C 000A6080 */ sll $t4, $t2, 2 -/* B62020 800EAE80 05830006 */ bgezl $t4, .L800EAE9C -/* B62024 800EAE84 8D0F0000 */ lw $t7, ($t0) -/* B62028 800EAE88 910D0003 */ lbu $t5, 3($t0) -/* B6202C 800EAE8C 31AE0050 */ andi $t6, $t5, 0x50 -/* B62030 800EAE90 55C00007 */ bnezl $t6, .L800EAEB0 -/* B62034 800EAE94 90CA0000 */ lbu $t2, ($a2) -/* B62038 800EAE98 8D0F0000 */ lw $t7, ($t0) -.L800EAE9C: -/* B6203C 800EAE9C 8FAC002C */ lw $t4, 0x2c($sp) -/* B62040 800EAEA0 000FC8C0 */ sll $t9, $t7, 3 -/* B62044 800EAEA4 07230007 */ bgezl $t9, .L800EAEC4 -/* B62048 800EAEA8 8D8D00DC */ lw $t5, 0xdc($t4) -/* B6204C 800EAEAC 90CA0000 */ lbu $t2, ($a2) -.L800EAEB0: -/* B62050 800EAEB0 2402FFFF */ li $v0, -1 -/* B62054 800EAEB4 354B0020 */ ori $t3, $t2, 0x20 -/* B62058 800EAEB8 1000000A */ b .L800EAEE4 -/* B6205C 800EAEBC A0CB0000 */ sb $t3, ($a2) -/* B62060 800EAEC0 8D8D00DC */ lw $t5, 0xdc($t4) -.L800EAEC4: -/* B62064 800EAEC4 8FA20044 */ lw $v0, 0x44($sp) -/* B62068 800EAEC8 11A00006 */ beqz $t5, .L800EAEE4 -/* B6206C 800EAECC 00000000 */ nop -/* B62070 800EAED0 90CF0000 */ lbu $t7, ($a2) -/* B62074 800EAED4 2402FFFF */ li $v0, -1 -/* B62078 800EAED8 35F80020 */ ori $t8, $t7, 0x20 -/* B6207C 800EAEDC 10000001 */ b .L800EAEE4 -/* B62080 800EAEE0 A0D80000 */ sb $t8, ($a2) -.L800EAEE4: -/* B62084 800EAEE4 8FBF0014 */ lw $ra, 0x14($sp) -/* B62088 800EAEE8 27BD0040 */ addiu $sp, $sp, 0x40 -/* B6208C 800EAEEC 03E00008 */ jr $ra -/* B62090 800EAEF0 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800EAEF4.s b/asm/non_matchings/code/audio_seqplayer/func_800EAEF4.s deleted file mode 100644 index c0e33938dd..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800EAEF4.s +++ /dev/null @@ -1,16 +0,0 @@ -glabel func_800EAEF4 -/* B62094 800EAEF4 30A200FF */ andi $v0, $a1, 0xff -/* B62098 800EAEF8 3043000F */ andi $v1, $v0, 0xf -/* B6209C 800EAEFC 10600002 */ beqz $v1, .L800EAF08 -/* B620A0 800EAF00 AFA50004 */ sw $a1, 4($sp) -/* B620A4 800EAF04 A0830005 */ sb $v1, 5($a0) -.L800EAF08: -/* B620A8 800EAF08 00022903 */ sra $a1, $v0, 4 -/* B620AC 800EAF0C 30A500FF */ andi $a1, $a1, 0xff -/* B620B0 800EAF10 10A00002 */ beqz $a1, .L800EAF1C -/* B620B4 800EAF14 00000000 */ nop -/* B620B8 800EAF18 A0850006 */ sb $a1, 6($a0) -.L800EAF1C: -/* B620BC 800EAF1C 03E00008 */ jr $ra -/* B620C0 800EAF20 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800EAF24.s b/asm/non_matchings/code/audio_seqplayer/func_800EAF24.s deleted file mode 100644 index a73089bab2..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800EAF24.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_800EAF24 -/* B620C4 800EAF24 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B620C8 800EAF28 AFA50024 */ sw $a1, 0x24($sp) -/* B620CC 800EAF2C 93A50027 */ lbu $a1, 0x27($sp) -/* B620D0 800EAF30 AFBF0014 */ sw $ra, 0x14($sp) -/* B620D4 800EAF34 AFA40020 */ sw $a0, 0x20($sp) -/* B620D8 800EAF38 AFA60028 */ sw $a2, 0x28($sp) -/* B620DC 800EAF3C AFA7002C */ sw $a3, 0x2c($sp) -/* B620E0 800EAF40 90840007 */ lbu $a0, 7($a0) -/* B620E4 800EAF44 0C039D26 */ jal Audio_GetInstrumentInner -/* B620E8 800EAF48 AFA50018 */ sw $a1, 0x18($sp) -/* B620EC 800EAF4C 8FA50018 */ lw $a1, 0x18($sp) -/* B620F0 800EAF50 8FA60028 */ lw $a2, 0x28($sp) -/* B620F4 800EAF54 8FA7002C */ lw $a3, 0x2c($sp) -/* B620F8 800EAF58 14400004 */ bnez $v0, .L800EAF6C -/* B620FC 800EAF5C 00401825 */ move $v1, $v0 -/* B62100 800EAF60 ACC00000 */ sw $zero, ($a2) -/* B62104 800EAF64 10000008 */ b .L800EAF88 -/* B62108 800EAF68 00001025 */ move $v0, $zero -.L800EAF6C: -/* B6210C 800EAF6C 8C6F0004 */ lw $t7, 4($v1) -/* B62110 800EAF70 24A40002 */ addiu $a0, $a1, 2 -/* B62114 800EAF74 308200FF */ andi $v0, $a0, 0xff -/* B62118 800EAF78 ACEF0004 */ sw $t7, 4($a3) -/* B6211C 800EAF7C 90780003 */ lbu $t8, 3($v1) -/* B62120 800EAF80 A0F80000 */ sb $t8, ($a3) -/* B62124 800EAF84 ACC30000 */ sw $v1, ($a2) -.L800EAF88: -/* B62128 800EAF88 8FBF0014 */ lw $ra, 0x14($sp) -/* B6212C 800EAF8C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B62130 800EAF90 03E00008 */ jr $ra -/* B62134 800EAF94 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800EAF98.s b/asm/non_matchings/code/audio_seqplayer/func_800EAF98.s deleted file mode 100644 index c6260b9198..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800EAF98.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_800EAF98 -/* B62138 800EAF98 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B6213C 800EAF9C AFA5001C */ sw $a1, 0x1c($sp) -/* B62140 800EAFA0 30A500FF */ andi $a1, $a1, 0xff -/* B62144 800EAFA4 28A10080 */ slti $at, $a1, 0x80 -/* B62148 800EAFA8 AFBF0014 */ sw $ra, 0x14($sp) -/* B6214C 800EAFAC 14200004 */ bnez $at, .L800EAFC0 -/* B62150 800EAFB0 00A01025 */ move $v0, $a1 -/* B62154 800EAFB4 A4820024 */ sh $v0, 0x24($a0) -/* B62158 800EAFB8 1000001B */ b .L800EB028 -/* B6215C 800EAFBC AC800048 */ sw $zero, 0x48($a0) -.L800EAFC0: -/* B62160 800EAFC0 2401007F */ li $at, 127 -/* B62164 800EAFC4 14410004 */ bne $v0, $at, .L800EAFD8 -/* B62168 800EAFC8 240E0001 */ li $t6, 1 -/* B6216C 800EAFCC A4800024 */ sh $zero, 0x24($a0) -/* B62170 800EAFD0 10000015 */ b .L800EB028 -/* B62174 800EAFD4 AC8E0048 */ sw $t6, 0x48($a0) -.L800EAFD8: -/* B62178 800EAFD8 2401007E */ li $at, 126 -/* B6217C 800EAFDC 14410006 */ bne $v0, $at, .L800EAFF8 -/* B62180 800EAFE0 24860048 */ addiu $a2, $a0, 0x48 -/* B62184 800EAFE4 240F0001 */ li $t7, 1 -/* B62188 800EAFE8 24180002 */ li $t8, 2 -/* B6218C 800EAFEC A48F0024 */ sh $t7, 0x24($a0) -/* B62190 800EAFF0 1000000D */ b .L800EB028 -/* B62194 800EAFF4 AC980048 */ sw $t8, 0x48($a0) -.L800EAFF8: -/* B62198 800EAFF8 2487007C */ addiu $a3, $a0, 0x7c -/* B6219C 800EAFFC 0C03ABC9 */ jal func_800EAF24 -/* B621A0 800EB000 AFA40018 */ sw $a0, 0x18($sp) -/* B621A4 800EB004 8FA40018 */ lw $a0, 0x18($sp) -/* B621A8 800EB008 0002CC00 */ sll $t9, $v0, 0x10 -/* B621AC 800EB00C 00194403 */ sra $t0, $t9, 0x10 -/* B621B0 800EB010 15000005 */ bnez $t0, .L800EB028 -/* B621B4 800EB014 A4820024 */ sh $v0, 0x24($a0) -/* B621B8 800EB018 90890000 */ lbu $t1, ($a0) -/* B621BC 800EB01C 312AFFF7 */ andi $t2, $t1, 0xfff7 -/* B621C0 800EB020 10000004 */ b .L800EB034 -/* B621C4 800EB024 A08A0000 */ sb $t2, ($a0) -.L800EB028: -/* B621C8 800EB028 908C0000 */ lbu $t4, ($a0) -/* B621CC 800EB02C 358D0008 */ ori $t5, $t4, 8 -/* B621D0 800EB030 A08D0000 */ sb $t5, ($a0) -.L800EB034: -/* B621D4 800EB034 8FBF0014 */ lw $ra, 0x14($sp) -/* B621D8 800EB038 27BD0018 */ addiu $sp, $sp, 0x18 -/* B621DC 800EB03C 03E00008 */ jr $ra -/* B621E0 800EB040 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800EB044.s b/asm/non_matchings/code/audio_seqplayer/func_800EB044.s deleted file mode 100644 index b93312d0b7..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800EB044.s +++ /dev/null @@ -1,11 +0,0 @@ -glabel func_800EB044 -/* B621E4 800EB044 AFA50004 */ sw $a1, 4($sp) -/* B621E8 800EB048 30A500FF */ andi $a1, $a1, 0xff -/* B621EC 800EB04C 44852000 */ mtc1 $a1, $f4 -/* B621F0 800EB050 3C0142FE */ li $at, 0x42FE0000 # 0.000000 -/* B621F4 800EB054 44814000 */ mtc1 $at, $f8 -/* B621F8 800EB058 468021A0 */ cvt.s.w $f6, $f4 -/* B621FC 800EB05C 46083283 */ div.s $f10, $f6, $f8 -/* B62200 800EB060 03E00008 */ jr $ra -/* B62204 800EB064 E48A002C */ swc1 $f10, 0x2c($a0) - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800EC564.s b/asm/non_matchings/code/audio_seqplayer/func_800EC564.s deleted file mode 100644 index 9da92b0834..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800EC564.s +++ /dev/null @@ -1,50 +0,0 @@ -glabel func_800EC564 -/* B63704 800EC564 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 -/* B63708 800EC568 2463F180 */ addiu $v1, %lo(gAudioContext) # addiu $v1, $v1, -0xe80 -/* B6370C 800EC56C 846E2854 */ lh $t6, 0x2854($v1) -/* B63710 800EC570 8C792894 */ lw $t9, 0x2894($v1) -/* B63714 800EC574 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B63718 800EC578 01C47823 */ subu $t7, $t6, $a0 -/* B6371C 800EC57C 25F8FFFF */ addiu $t8, $t7, -1 -/* B63720 800EC580 03190019 */ multu $t8, $t9 -/* B63724 800EC584 8462285C */ lh $v0, 0x285c($v1) -/* B63728 800EC588 AFB10018 */ sw $s1, 0x18($sp) -/* B6372C 800EC58C AFB30020 */ sw $s3, 0x20($sp) -/* B63730 800EC590 AFB2001C */ sw $s2, 0x1c($sp) -/* B63734 800EC594 3C118017 */ lui $s1, %hi(gAudioContext) # $s1, 0x8017 -/* B63738 800EC598 AFBF0024 */ sw $ra, 0x24($sp) -/* B6373C 800EC59C AFB00014 */ sw $s0, 0x14($sp) -/* B63740 800EC5A0 2631F180 */ addiu $s1, %lo(gAudioContext) # addiu $s1, $s1, -0xe80 -/* B63744 800EC5A4 00009025 */ move $s2, $zero -/* B63748 800EC5A8 00004012 */ mflo $t0 -/* B6374C 800EC5AC AC685B84 */ sw $t0, 0x5b84($v1) -/* B63750 800EC5B0 10400010 */ beqz $v0, .L800EC5F4 -/* B63754 800EC5B4 24130001 */ li $s3, 1 -.L800EC5B8: -/* B63758 800EC5B8 8E293530 */ lw $t1, 0x3530($s1) -/* B6375C 800EC5BC 26303530 */ addiu $s0, $s1, 0x3530 -/* B63760 800EC5C0 000957C2 */ srl $t2, $t1, 0x1f -/* B63764 800EC5C4 566A0008 */ bnel $s3, $t2, .L800EC5E8 -/* B63768 800EC5C8 26520001 */ addiu $s2, $s2, 1 -/* B6376C 800EC5CC 0C03AF56 */ jal func_800EBD58 -/* B63770 800EC5D0 02002025 */ move $a0, $s0 -/* B63774 800EC5D4 0C03A2A2 */ jal Audio_SequencePlayerProcessSound -/* B63778 800EC5D8 02002025 */ move $a0, $s0 -/* B6377C 800EC5DC 3C028017 */ lui $v0, %hi(D_801719DC) # $v0, 0x8017 -/* B63780 800EC5E0 844219DC */ lh $v0, %lo(D_801719DC)($v0) -/* B63784 800EC5E4 26520001 */ addiu $s2, $s2, 1 -.L800EC5E8: -/* B63788 800EC5E8 0242082B */ sltu $at, $s2, $v0 -/* B6378C 800EC5EC 1420FFF2 */ bnez $at, .L800EC5B8 -/* B63790 800EC5F0 26310160 */ addiu $s1, $s1, 0x160 -.L800EC5F4: -/* B63794 800EC5F4 0C039BE3 */ jal Audio_ProcessNotes -/* B63798 800EC5F8 00000000 */ nop -/* B6379C 800EC5FC 8FBF0024 */ lw $ra, 0x24($sp) -/* B637A0 800EC600 8FB00014 */ lw $s0, 0x14($sp) -/* B637A4 800EC604 8FB10018 */ lw $s1, 0x18($sp) -/* B637A8 800EC608 8FB2001C */ lw $s2, 0x1c($sp) -/* B637AC 800EC60C 8FB30020 */ lw $s3, 0x20($sp) -/* B637B0 800EC610 03E00008 */ jr $ra -/* B637B4 800EC614 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800EC618.s b/asm/non_matchings/code/audio_seqplayer/func_800EC618.s deleted file mode 100644 index f285d7530c..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800EC618.s +++ /dev/null @@ -1,24 +0,0 @@ -glabel func_800EC618 -/* B637B8 800EC618 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B637BC 800EC61C AFBF001C */ sw $ra, 0x1c($sp) -/* B637C0 800EC620 AFB00018 */ sw $s0, 0x18($sp) -/* B637C4 800EC624 8C8E00DC */ lw $t6, 0xdc($a0) -/* B637C8 800EC628 00808025 */ move $s0, $a0 -/* B637CC 800EC62C 59C0000A */ blezl $t6, .L800EC658 -/* B637D0 800EC630 8FBF001C */ lw $ra, 0x1c($sp) -.L800EC634: -/* B637D4 800EC634 0C03AF56 */ jal func_800EBD58 -/* B637D8 800EC638 02002025 */ move $a0, $s0 -/* B637DC 800EC63C 0C03A2A2 */ jal Audio_SequencePlayerProcessSound -/* B637E0 800EC640 02002025 */ move $a0, $s0 -/* B637E4 800EC644 8E0F00DC */ lw $t7, 0xdc($s0) -/* B637E8 800EC648 25F8FFFF */ addiu $t8, $t7, -1 -/* B637EC 800EC64C 1F00FFF9 */ bgtz $t8, .L800EC634 -/* B637F0 800EC650 AE1800DC */ sw $t8, 0xdc($s0) -/* B637F4 800EC654 8FBF001C */ lw $ra, 0x1c($sp) -.L800EC658: -/* B637F8 800EC658 8FB00018 */ lw $s0, 0x18($sp) -/* B637FC 800EC65C 27BD0020 */ addiu $sp, $sp, 0x20 -/* B63800 800EC660 03E00008 */ jr $ra -/* B63804 800EC664 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800EC668.s b/asm/non_matchings/code/audio_seqplayer/func_800EC668.s deleted file mode 100644 index 92b889a65b..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800EC668.s +++ /dev/null @@ -1,54 +0,0 @@ -glabel func_800EC668 -/* B63808 800EC668 27BDFFD8 */ addiu $sp, $sp, -0x28 -/* B6380C 800EC66C AFBF0024 */ sw $ra, 0x24($sp) -/* B63810 800EC670 AFB20020 */ sw $s2, 0x20($sp) -/* B63814 800EC674 AFB1001C */ sw $s1, 0x1c($sp) -/* B63818 800EC678 AFB00018 */ sw $s0, 0x18($sp) -/* B6381C 800EC67C 0C03A6DB */ jal Audio_SequencePlayerDisable -/* B63820 800EC680 AFA40028 */ sw $a0, 0x28($sp) -/* B63824 800EC684 8FB10028 */ lw $s1, 0x28($sp) -/* B63828 800EC688 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B6382C 800EC68C 44812000 */ mtc1 $at, $f4 -/* B63830 800EC690 44800000 */ mtc1 $zero, $f0 -/* B63834 800EC694 922E0000 */ lbu $t6, ($s1) -/* B63838 800EC698 3C013F00 */ li $at, 0x3F000000 # 0.000000 -/* B6383C 800EC69C 44813000 */ mtc1 $at, $f6 -/* B63840 800EC6A0 3C088013 */ lui $t0, %hi(D_8012FAB4) # $t0, 0x8013 -/* B63844 800EC6A4 3C098013 */ lui $t1, %hi(D_8012FAC4) # $t1, 0x8013 -/* B63848 800EC6A8 24180001 */ li $t8, 1 -/* B6384C 800EC6AC 24191680 */ li $t9, 5760 -/* B63850 800EC6B0 2508FAB4 */ addiu $t0, %lo(D_8012FAB4) # addiu $t0, $t0, -0x54c -/* B63854 800EC6B4 2529FAC4 */ addiu $t1, %lo(D_8012FAC4) # addiu $t1, $t1, -0x53c -/* B63858 800EC6B8 31CFFFFD */ andi $t7, $t6, 0xfffd -/* B6385C 800EC6BC 00008025 */ move $s0, $zero -/* B63860 800EC6C0 24120040 */ li $s2, 64 -/* B63864 800EC6C4 A22F0000 */ sb $t7, ($s1) -/* B63868 800EC6C8 A6200010 */ sh $zero, 0x10($s1) -/* B6386C 800EC6CC A2380001 */ sb $t8, 1($s1) -/* B63870 800EC6D0 A6200012 */ sh $zero, 0x12($s1) -/* B63874 800EC6D4 A6200014 */ sh $zero, 0x14($s1) -/* B63878 800EC6D8 A620000A */ sh $zero, 0xa($s1) -/* B6387C 800EC6DC A6390008 */ sh $t9, 8($s1) -/* B63880 800EC6E0 A620000C */ sh $zero, 0xc($s1) -/* B63884 800EC6E4 A620000E */ sh $zero, 0xe($s1) -/* B63888 800EC6E8 A2200002 */ sb $zero, 2($s1) -/* B6388C 800EC6EC AE280094 */ sw $t0, 0x94($s1) -/* B63890 800EC6F0 AE290098 */ sw $t1, 0x98($s1) -/* B63894 800EC6F4 AE2000E0 */ sw $zero, 0xe0($s1) -/* B63898 800EC6F8 E624001C */ swc1 $f4, 0x1c($s1) -/* B6389C 800EC6FC E6200020 */ swc1 $f0, 0x20($s1) -/* B638A0 800EC700 E6200024 */ swc1 $f0, 0x24($s1) -/* B638A4 800EC704 E6260028 */ swc1 $f6, 0x28($s1) -.L800EC708: -/* B638A8 800EC708 0C03A561 */ jal func_800E9584 -/* B638AC 800EC70C 8E240038 */ lw $a0, 0x38($s1) -/* B638B0 800EC710 26100004 */ addiu $s0, $s0, 4 -/* B638B4 800EC714 1612FFFC */ bne $s0, $s2, .L800EC708 -/* B638B8 800EC718 26310004 */ addiu $s1, $s1, 4 -/* B638BC 800EC71C 8FBF0024 */ lw $ra, 0x24($sp) -/* B638C0 800EC720 8FB00018 */ lw $s0, 0x18($sp) -/* B638C4 800EC724 8FB1001C */ lw $s1, 0x1c($sp) -/* B638C8 800EC728 8FB20020 */ lw $s2, 0x20($sp) -/* B638CC 800EC72C 03E00008 */ jr $ra -/* B638D0 800EC730 27BD0028 */ addiu $sp, $sp, 0x28 - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800EC734.s b/asm/non_matchings/code/audio_seqplayer/func_800EC734.s deleted file mode 100644 index 028813fe37..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800EC734.s +++ /dev/null @@ -1,59 +0,0 @@ -glabel func_800EC734 -/* B638D4 800EC734 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* B638D8 800EC738 00047080 */ sll $t6, $a0, 2 -/* B638DC 800EC73C 01C47023 */ subu $t6, $t6, $a0 -/* B638E0 800EC740 000E7080 */ sll $t6, $t6, 2 -/* B638E4 800EC744 01C47023 */ subu $t6, $t6, $a0 -/* B638E8 800EC748 000E7140 */ sll $t6, $t6, 5 -/* B638EC 800EC74C 3C188017 */ lui $t8, %hi(gAudioContext) # $t8, 0x8017 -/* B638F0 800EC750 AFB40024 */ sw $s4, 0x24($sp) -/* B638F4 800EC754 AFB30020 */ sw $s3, 0x20($sp) -/* B638F8 800EC758 AFB2001C */ sw $s2, 0x1c($sp) -/* B638FC 800EC75C 2718F180 */ addiu $t8, %lo(gAudioContext) # addiu $t8, $t8, -0xe80 -/* B63900 800EC760 25CF3530 */ addiu $t7, $t6, 0x3530 -/* B63904 800EC764 AFB50028 */ sw $s5, 0x28($sp) -/* B63908 800EC768 AFB10018 */ sw $s1, 0x18($sp) -/* B6390C 800EC76C AFB00014 */ sw $s0, 0x14($sp) -/* B63910 800EC770 01F89021 */ addu $s2, $t7, $t8 -/* B63914 800EC774 3C138017 */ lui $s3, %hi(D_80171B40) # $s3, 0x8017 -/* B63918 800EC778 3C148017 */ lui $s4, %hi(D_80174C30) # $s4, 0x8017 -/* B6391C 800EC77C AFBF002C */ sw $ra, 0x2c($sp) -/* B63920 800EC780 26944C30 */ addiu $s4, %lo(D_80174C30) # addiu $s4, $s4, 0x4c30 -/* B63924 800EC784 26731B40 */ addiu $s3, %lo(D_80171B40) # addiu $s3, $s3, 0x1b40 -/* B63928 800EC788 02408025 */ move $s0, $s2 -/* B6392C 800EC78C 00008825 */ move $s1, $zero -/* B63930 800EC790 24150040 */ li $s5, 64 -.L800EC794: -/* B63934 800EC794 02602025 */ move $a0, $s3 -/* B63938 800EC798 0C0378E0 */ jal func_800DE380 -/* B6393C 800EC79C 240500D4 */ li $a1, 212 -/* B63940 800EC7A0 14400003 */ bnez $v0, .L800EC7B0 -/* B63944 800EC7A4 AE020038 */ sw $v0, 0x38($s0) -/* B63948 800EC7A8 1000000A */ b .L800EC7D4 -/* B6394C 800EC7AC AE140038 */ sw $s4, 0x38($s0) -.L800EC7B0: -/* B63950 800EC7B0 8E030038 */ lw $v1, 0x38($s0) -/* B63954 800EC7B4 90790000 */ lbu $t9, ($v1) -/* B63958 800EC7B8 AC72004C */ sw $s2, 0x4c($v1) -/* B6395C 800EC7BC AC600054 */ sw $zero, 0x54($v1) -/* B63960 800EC7C0 3328FF7F */ andi $t0, $t9, 0xff7f -/* B63964 800EC7C4 A0680000 */ sb $t0, ($v1) -/* B63968 800EC7C8 AC600058 */ sw $zero, 0x58($v1) -/* B6396C 800EC7CC AC60005C */ sw $zero, 0x5c($v1) -/* B63970 800EC7D0 AC600050 */ sw $zero, 0x50($v1) -.L800EC7D4: -/* B63974 800EC7D4 0C03A561 */ jal func_800E9584 -/* B63978 800EC7D8 8E040038 */ lw $a0, 0x38($s0) -/* B6397C 800EC7DC 26310004 */ addiu $s1, $s1, 4 -/* B63980 800EC7E0 1635FFEC */ bne $s1, $s5, .L800EC794 -/* B63984 800EC7E4 26100004 */ addiu $s0, $s0, 4 -/* B63988 800EC7E8 8FBF002C */ lw $ra, 0x2c($sp) -/* B6398C 800EC7EC 8FB00014 */ lw $s0, 0x14($sp) -/* B63990 800EC7F0 8FB10018 */ lw $s1, 0x18($sp) -/* B63994 800EC7F4 8FB2001C */ lw $s2, 0x1c($sp) -/* B63998 800EC7F8 8FB30020 */ lw $s3, 0x20($sp) -/* B6399C 800EC7FC 8FB40024 */ lw $s4, 0x24($sp) -/* B639A0 800EC800 8FB50028 */ lw $s5, 0x28($sp) -/* B639A4 800EC804 03E00008 */ jr $ra -/* B639A8 800EC808 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800EC80C.s b/asm/non_matchings/code/audio_seqplayer/func_800EC80C.s deleted file mode 100644 index 9a5be0ab8f..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800EC80C.s +++ /dev/null @@ -1,56 +0,0 @@ -glabel func_800EC80C -/* B639AC 800EC80C 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* B639B0 800EC810 00803025 */ move $a2, $a0 -/* B639B4 800EC814 00801825 */ move $v1, $a0 -/* B639B8 800EC818 3C028017 */ lui $v0, %hi(D_80174C30) # $v0, 0x8017 -/* B639BC 800EC81C AFBF0014 */ sw $ra, 0x14($sp) -/* B639C0 800EC820 24424C30 */ addiu $v0, %lo(D_80174C30) # addiu $v0, $v0, 0x4c30 -/* B639C4 800EC824 24040010 */ li $a0, 16 -/* B639C8 800EC828 00002825 */ move $a1, $zero -.L800EC82C: -/* B639CC 800EC82C 24A50004 */ addiu $a1, $a1, 4 -/* B639D0 800EC830 AC62003C */ sw $v0, 0x3c($v1) -/* B639D4 800EC834 AC620040 */ sw $v0, 0x40($v1) -/* B639D8 800EC838 AC620044 */ sw $v0, 0x44($v1) -/* B639DC 800EC83C 24630010 */ addiu $v1, $v1, 0x10 -/* B639E0 800EC840 14A4FFFA */ bne $a1, $a0, .L800EC82C -/* B639E4 800EC844 AC620028 */ sw $v0, 0x28($v1) -/* B639E8 800EC848 90CE0000 */ lbu $t6, ($a2) -/* B639EC 800EC84C 00002025 */ move $a0, $zero -/* B639F0 800EC850 00C01825 */ move $v1, $a2 -/* B639F4 800EC854 31D8FF7F */ andi $t8, $t6, 0xff7f -/* B639F8 800EC858 330800DF */ andi $t0, $t8, 0xdf -/* B639FC 800EC85C A0D80000 */ sb $t8, ($a2) -/* B63A00 800EC860 310A00F7 */ andi $t2, $t0, 0xf7 -/* B63A04 800EC864 A0C80000 */ sb $t0, ($a2) -/* B63A08 800EC868 314C00EF */ andi $t4, $t2, 0xef -/* B63A0C 800EC86C A0CA0000 */ sb $t2, ($a2) -/* B63A10 800EC870 A0CC0000 */ sb $t4, ($a2) -/* B63A14 800EC874 318D00FE */ andi $t5, $t4, 0xfe -/* B63A18 800EC878 A0CD0000 */ sb $t5, ($a2) -/* B63A1C 800EC87C 24050008 */ li $a1, 8 -/* B63A20 800EC880 2402FFFF */ li $v0, -1 -.L800EC884: -/* B63A24 800EC884 24840004 */ addiu $a0, $a0, 4 -/* B63A28 800EC888 A0620159 */ sb $v0, 0x159($v1) -/* B63A2C 800EC88C A062015A */ sb $v0, 0x15a($v1) -/* B63A30 800EC890 A062015B */ sb $v0, 0x15b($v1) -/* B63A34 800EC894 24630004 */ addiu $v1, $v1, 4 -/* B63A38 800EC898 1485FFFA */ bne $a0, $a1, .L800EC884 -/* B63A3C 800EC89C A0620154 */ sb $v0, 0x154($v1) -/* B63A40 800EC8A0 3C013F80 */ li $at, 0x3F800000 # 0.000000 -/* B63A44 800EC8A4 44810000 */ mtc1 $at, $f0 -/* B63A48 800EC8A8 240E0060 */ li $t6, 96 -/* B63A4C 800EC8AC A0CE0003 */ sb $t6, 3($a2) -/* B63A50 800EC8B0 E4C0002C */ swc1 $f0, 0x2c($a2) -/* B63A54 800EC8B4 E4C00034 */ swc1 $f0, 0x34($a2) -/* B63A58 800EC8B8 AFA60018 */ sw $a2, 0x18($sp) -/* B63A5C 800EC8BC 0C039F43 */ jal Audio_InitNoteLists -/* B63A60 800EC8C0 24C4009C */ addiu $a0, $a2, 0x9c -/* B63A64 800EC8C4 0C03B19A */ jal func_800EC668 -/* B63A68 800EC8C8 8FA40018 */ lw $a0, 0x18($sp) -/* B63A6C 800EC8CC 8FBF0014 */ lw $ra, 0x14($sp) -/* B63A70 800EC8D0 27BD0018 */ addiu $sp, $sp, 0x18 -/* B63A74 800EC8D4 03E00008 */ jr $ra -/* B63A78 800EC8D8 00000000 */ nop - diff --git a/asm/non_matchings/code/audio_seqplayer/func_800EC8DC.s b/asm/non_matchings/code/audio_seqplayer/func_800EC8DC.s deleted file mode 100644 index 5cc2432525..0000000000 --- a/asm/non_matchings/code/audio_seqplayer/func_800EC8DC.s +++ /dev/null @@ -1,33 +0,0 @@ -glabel func_800EC8DC -/* B63A7C 800EC8DC 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B63A80 800EC8E0 AFBF001C */ sw $ra, 0x1c($sp) -/* B63A84 800EC8E4 AFB10018 */ sw $s1, 0x18($sp) -/* B63A88 800EC8E8 0C03A72A */ jal func_800E9CA8 -/* B63A8C 800EC8EC AFB00014 */ sw $s0, 0x14($sp) -/* B63A90 800EC8F0 3C028017 */ lui $v0, %hi(gAudioContext) # $v0, 0x8017 -/* B63A94 800EC8F4 3C038017 */ lui $v1, %hi(D_80171180) # $v1, 0x8017 -/* B63A98 800EC8F8 24631180 */ addiu $v1, %lo(D_80171180) # addiu $v1, $v1, 0x1180 -/* B63A9C 800EC8FC 2442F180 */ addiu $v0, %lo(gAudioContext) # addiu $v0, $v0, -0xe80 -.L800EC900: -/* B63AA0 800EC900 904E3AB0 */ lbu $t6, 0x3ab0($v0) -/* B63AA4 800EC904 24420080 */ addiu $v0, $v0, 0x80 -/* B63AA8 800EC908 0043082B */ sltu $at, $v0, $v1 -/* B63AAC 800EC90C 31CFFF7F */ andi $t7, $t6, 0xff7f -/* B63AB0 800EC910 AC403A80 */ sw $zero, 0x3a80($v0) -/* B63AB4 800EC914 1420FFFA */ bnez $at, .L800EC900 -/* B63AB8 800EC918 A04F3A30 */ sb $t7, 0x3a30($v0) -/* B63ABC 800EC91C 3C108017 */ lui $s0, %hi(D_801726B0) # $s0, 0x8017 -/* B63AC0 800EC920 3C118017 */ lui $s1, %hi(D_80172C30) # $s1, 0x8017 -/* B63AC4 800EC924 26312C30 */ addiu $s1, %lo(D_80172C30) # addiu $s1, $s1, 0x2c30 -/* B63AC8 800EC928 261026B0 */ addiu $s0, %lo(D_801726B0) # addiu $s0, $s0, 0x26b0 -.L800EC92C: -/* B63ACC 800EC92C 0C03B203 */ jal func_800EC80C -/* B63AD0 800EC930 02002025 */ move $a0, $s0 -/* B63AD4 800EC934 26100160 */ addiu $s0, $s0, 0x160 -/* B63AD8 800EC938 1611FFFC */ bne $s0, $s1, .L800EC92C -/* B63ADC 800EC93C 00000000 */ nop -/* B63AE0 800EC940 8FBF001C */ lw $ra, 0x1c($sp) -/* B63AE4 800EC944 8FB00014 */ lw $s0, 0x14($sp) -/* B63AE8 800EC948 8FB10018 */ lw $s1, 0x18($sp) -/* B63AEC 800EC94C 03E00008 */ jr $ra -/* B63AF0 800EC950 27BD0020 */ addiu $sp, $sp, 0x20 \ No newline at end of file diff --git a/asm/non_matchings/code/code_800DACC0/func_800DB0C4.s b/asm/non_matchings/code/code_800DACC0/func_800DB0C4.s index d44b67a2d6..fae0c22fbb 100644 --- a/asm/non_matchings/code/code_800DACC0/func_800DB0C4.s +++ b/asm/non_matchings/code/code_800DACC0/func_800DB0C4.s @@ -21,7 +21,7 @@ glabel func_800DB0C4 /* B522B0 800DB110 0080F025 */ move $fp, $a0 .L800DB114: /* B522B4 800DB114 2690FFFF */ addiu $s0, $s4, -1 -/* B522B8 800DB118 0C03B159 */ jal func_800EC564 +/* 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 diff --git a/asm/non_matchings/code/code_800DACC0/func_800DC910.s b/asm/non_matchings/code/code_800DACC0/func_800DC910.s index 4f2116f253..3ad2f7f00e 100644 --- a/asm/non_matchings/code/code_800DACC0/func_800DC910.s +++ b/asm/non_matchings/code/code_800DACC0/func_800DC910.s @@ -24,9 +24,9 @@ glabel func_800DC910 /* B53AE0 800DC940 AFA7016C */ sw $a3, 0x16c($sp) /* B53AE4 800DC944 8CA30000 */ lw $v1, ($a1) /* B53AE8 800DC948 0004C8C0 */ sll $t9, $a0, 3 -/* B53AEC 800DC94C 3C0C8017 */ lui $t4, %hi(D_801726AC) # $t4, 0x8017 +/* B53AEC 800DC94C 3C0C8017 */ lui $t4, %hi(gAudioContext+0x352c) # $t4, 0x8017 /* B53AF0 800DC950 000372C0 */ sll $t6, $v1, 0xb -/* B53AF4 800DC954 8D8C26AC */ lw $t4, %lo(D_801726AC)($t4) +/* B53AF4 800DC954 8D8C26AC */ lw $t4, %lo(gAudioContext+0x352c)($t4) /* B53AF8 800DC958 000E7F82 */ srl $t7, $t6, 0x1e /* B53AFC 800DC95C 0324C823 */ subu $t9, $t9, $a0 /* B53B00 800DC960 00036840 */ sll $t5, $v1, 1 @@ -157,8 +157,8 @@ glabel func_800DC910 /* B53CDC 800DCB3C 00000000 */ nop .L800DCB40: /* B53CE0 800DCB40 8FAE0150 */ lw $t6, 0x150($sp) -/* B53CE4 800DCB44 3C188017 */ lui $t8, %hi(D_8016F190) # $t8, 0x8017 -/* B53CE8 800DCB48 8F18F190 */ lw $t8, %lo(D_8016F190)($t8) +/* B53CE4 800DCB44 3C188017 */ lui $t8, %hi(gAudioContext+0x10) # $t8, 0x8017 +/* B53CE8 800DCB48 8F18F190 */ lw $t8, %lo(gAudioContext+0x10)($t8) /* B53CEC 800DCB4C 8DC2000C */ lw $v0, 0xc($t6) /* B53CF0 800DCB50 8FAF008C */ lw $t7, 0x8c($sp) /* B53CF4 800DCB54 24010001 */ li $at, 1 @@ -176,19 +176,19 @@ glabel func_800DC910 /* B53D24 800DCB84 00000000 */ nop .L800DCB88: /* B53D28 800DCB88 258CFBAA */ addiu $t4, %lo(D_8012FBAA) # addiu $t4, $t4, -0x456 -/* B53D2C 800DCB8C 3C018017 */ lui $at, %hi(D_8016F190) # $at, 0x8017 +/* B53D2C 800DCB8C 3C018017 */ lui $at, %hi(gAudioContext+0x10) # $at, 0x8017 /* B53D30 800DCB90 10000003 */ b .L800DCBA0 -/* B53D34 800DCB94 AC2CF190 */ sw $t4, %lo(D_8016F190)($at) +/* B53D34 800DCB94 AC2CF190 */ sw $t4, %lo(gAudioContext+0x10)($at) .L800DCB98: -/* B53D38 800DCB98 3C018017 */ lui $at, %hi(D_8016F190) # $at, 0x8017 -/* B53D3C 800DCB9C AC22F190 */ sw $v0, %lo(D_8016F190)($at) +/* B53D38 800DCB98 3C018017 */ lui $at, %hi(gAudioContext+0x10) # $at, 0x8017 +/* B53D3C 800DCB9C AC22F190 */ sw $v0, %lo(gAudioContext+0x10)($at) .L800DCBA0: /* B53D40 800DCBA0 8FB90150 */ lw $t9, 0x150($sp) /* B53D44 800DCBA4 3C0100FF */ lui $at, (0x00FFFFFF >> 16) # lui $at, 0xff /* B53D48 800DCBA8 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff /* B53D4C 800DCBAC 8F22000C */ lw $v0, 0xc($t9) /* B53D50 800DCBB0 02401825 */ move $v1, $s2 -/* B53D54 800DCBB4 3C198017 */ lui $t9, %hi(D_8016F190) # $t9, 0x8017 +/* B53D54 800DCBB4 3C198017 */ lui $t9, %hi(gAudioContext+0x10) # $t9, 0x8017 /* B53D58 800DCBB8 8C4D0000 */ lw $t5, ($v0) /* B53D5C 800DCBBC 8C580004 */ lw $t8, 4($v0) /* B53D60 800DCBC0 26520008 */ addiu $s2, $s2, 8 @@ -199,7 +199,7 @@ glabel func_800DC910 /* B53D74 800DCBD4 3C010B00 */ lui $at, 0xb00 /* B53D78 800DCBD8 01E16025 */ or $t4, $t7, $at /* B53D7C 800DCBDC AC6C0000 */ sw $t4, ($v1) -/* B53D80 800DCBE0 8F39F190 */ lw $t9, %lo(D_8016F190)($t9) +/* B53D80 800DCBE0 8F39F190 */ lw $t9, %lo(gAudioContext+0x10)($t9) /* B53D84 800DCBE4 AC790004 */ sw $t9, 4($v1) /* B53D88 800DCBE8 8FA300C0 */ lw $v1, 0xc0($sp) .L800DCBEC: diff --git a/asm/non_matchings/code/code_800E11F0/func_800E18B0.s b/asm/non_matchings/code/code_800E11F0/Audio_IsBankLoadComplete.s similarity index 80% rename from asm/non_matchings/code/code_800E11F0/func_800E18B0.s rename to asm/non_matchings/code/code_800E11F0/Audio_IsBankLoadComplete.s index 26b00a3496..286d4532b2 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E18B0.s +++ b/asm/non_matchings/code/code_800E11F0/Audio_IsBankLoadComplete.s @@ -1,4 +1,4 @@ -glabel func_800E18B0 +glabel Audio_IsBankLoadComplete /* B58A50 800E18B0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B58A54 800E18B4 240100FF */ li $at, 255 /* B58A58 800E18B8 AFBF0014 */ sw $ra, 0x14($sp) @@ -7,9 +7,9 @@ glabel func_800E18B0 /* B58A64 800E18C4 10000014 */ b .L800E1918 /* B58A68 800E18C8 24020001 */ li $v0, 1 .L800E18CC: -/* B58A6C 800E18CC 3C0E8017 */ lui $t6, %hi(D_801725E8) +/* B58A6C 800E18CC 3C0E8017 */ lui $t6, %hi(gAudioContext+0x3468) /* B58A70 800E18D0 01C57021 */ addu $t6, $t6, $a1 -/* B58A74 800E18D4 91CE25E8 */ lbu $t6, %lo(D_801725E8)($t6) +/* 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 @@ -18,9 +18,9 @@ glabel func_800E18B0 .L800E18EC: /* B58A8C 800E18EC 0C0389DA */ jal func_800E2768 /* B58A90 800E18F0 24040001 */ li $a0, 1 -/* B58A94 800E18F4 3C0F8017 */ lui $t7, %hi(D_801725E8) +/* B58A94 800E18F4 3C0F8017 */ lui $t7, %hi(gAudioContext+0x3468) /* B58A98 800E18F8 01E27821 */ addu $t7, $t7, $v0 -/* B58A9C 800E18FC 91EF25E8 */ lbu $t7, %lo(D_801725E8)($t7) +/* 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 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1928.s b/asm/non_matchings/code/code_800E11F0/Audio_IsSeqLoadComplete.s similarity index 80% rename from asm/non_matchings/code/code_800E11F0/func_800E1928.s rename to asm/non_matchings/code/code_800E11F0/Audio_IsSeqLoadComplete.s index cf1a334349..7fe2fd19ee 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E1928.s +++ b/asm/non_matchings/code/code_800E11F0/Audio_IsSeqLoadComplete.s @@ -1,4 +1,4 @@ -glabel func_800E1928 +glabel Audio_IsSeqLoadComplete /* B58AC8 800E1928 27BDFFE8 */ addiu $sp, $sp, -0x18 /* B58ACC 800E192C 240100FF */ li $at, 255 /* B58AD0 800E1930 AFBF0014 */ sw $ra, 0x14($sp) @@ -7,9 +7,9 @@ glabel func_800E1928 /* B58ADC 800E193C 10000014 */ b .L800E1990 /* B58AE0 800E1940 24020001 */ li $v0, 1 .L800E1944: -/* B58AE4 800E1944 3C0E8017 */ lui $t6, %hi(D_80172618) +/* B58AE4 800E1944 3C0E8017 */ lui $t6, %hi(gAudioContext+0x3498) /* B58AE8 800E1948 01C57021 */ addu $t6, $t6, $a1 -/* B58AEC 800E194C 91CE2618 */ lbu $t6, %lo(D_80172618)($t6) +/* 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 @@ -18,9 +18,9 @@ glabel func_800E1928 .L800E1964: /* B58B04 800E1964 0C0389DA */ jal func_800E2768 /* B58B08 800E1968 00002025 */ move $a0, $zero -/* B58B0C 800E196C 3C0F8017 */ lui $t7, %hi(D_80172618) +/* B58B0C 800E196C 3C0F8017 */ lui $t7, %hi(gAudioContext+0x3498) /* B58B10 800E1970 01E27821 */ addu $t7, $t7, $v0 -/* B58B14 800E1974 91EF2618 */ lbu $t7, %lo(D_80172618)($t7) +/* 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 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1A18.s b/asm/non_matchings/code/code_800E11F0/Audio_SetBankLoadStatus.s similarity index 95% rename from asm/non_matchings/code/code_800E11F0/func_800E1A18.s rename to asm/non_matchings/code/code_800E11F0/Audio_SetBankLoadStatus.s index 38ac287c35..25cd9f239d 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E1A18.s +++ b/asm/non_matchings/code/code_800E11F0/Audio_SetBankLoadStatus.s @@ -1,4 +1,4 @@ -glabel func_800E1A18 +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 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1A48.s b/asm/non_matchings/code/code_800E11F0/Audio_SetSeqLoadStatus.s similarity index 95% rename from asm/non_matchings/code/code_800E11F0/func_800E1A48.s rename to asm/non_matchings/code/code_800E11F0/Audio_SetSeqLoadStatus.s index 33d233f69a..237202276a 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E1A48.s +++ b/asm/non_matchings/code/code_800E11F0/Audio_SetSeqLoadStatus.s @@ -1,4 +1,4 @@ -glabel func_800E1A48 +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 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E12DC.s b/asm/non_matchings/code/code_800E11F0/func_800E12DC.s index fc933ae708..860a4e5ed5 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E12DC.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E12DC.s @@ -191,10 +191,10 @@ glabel func_800E12DC /* B58730 800E1590 0003C080 */ sll $t8, $v1, 2 /* B58734 800E1594 0303C023 */ subu $t8, $t8, $v1 /* B58738 800E1598 0018C0C0 */ sll $t8, $t8, 3 -/* B5873C 800E159C 3C0C8017 */ lui $t4, %hi(D_80171050) # $t4, 0x8017 +/* B5873C 800E159C 3C0C8017 */ lui $t4, %hi(gAudioContext+0x1ed0) # $t4, 0x8017 /* B58740 800E15A0 3C0F8015 */ lui $t7, %hi(D_80149420) # $t7, 0x8015 /* B58744 800E15A4 25EF9420 */ addiu $t7, %lo(D_80149420) # addiu $t7, $t7, -0x6be0 -/* B58748 800E15A8 258C1050 */ addiu $t4, %lo(D_80171050) # addiu $t4, $t4, 0x1050 +/* B58748 800E15A8 258C1050 */ addiu $t4, %lo(gAudioContext+0x1ed0) # addiu $t4, $t4, 0x1050 /* B5874C 800E15AC 01382021 */ addu $a0, $t1, $t8 /* B58750 800E15B0 246D0001 */ addiu $t5, $v1, 1 /* B58754 800E15B4 AD2D28A0 */ sw $t5, 0x28a0($t1) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1618.s b/asm/non_matchings/code/code_800E11F0/func_800E1618.s index 3a98c30bbd..b035fa27ee 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E1618.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E1618.s @@ -9,8 +9,8 @@ glabel func_800E1618 /* B587D4 800E1634 0018C980 */ sll $t9, $t8, 6 /* B587D8 800E1638 03280019 */ multu $t9, $t0 /* B587DC 800E163C 8E4E2874 */ lw $t6, 0x2874($s2) -/* B587E0 800E1640 3C148017 */ lui $s4, %hi(D_80171B40) # $s4, 0x8017 -/* B587E4 800E1644 26941B40 */ addiu $s4, %lo(D_80171B40) # addiu $s4, $s4, 0x1b40 +/* B587E0 800E1640 3C148017 */ lui $s4, %hi(gAudioContext+0x29c0) # $s4, 0x8017 +/* B587E4 800E1644 26941B40 */ addiu $s4, %lo(gAudioContext+0x29c0) # addiu $s4, $s4, 0x1b40 /* B587E8 800E1648 AFBF002C */ sw $ra, 0x2c($sp) /* B587EC 800E164C AFA40030 */ sw $a0, 0x30($sp) /* B587F0 800E1650 AFB30024 */ sw $s3, 0x24($sp) @@ -19,7 +19,7 @@ glabel func_800E1618 /* B587FC 800E165C 02802025 */ move $a0, $s4 /* B58800 800E1660 00002812 */ mflo $a1 /* B58804 800E1664 AE4E288C */ sw $t6, 0x288c($s2) -/* B58808 800E1668 0C0378F7 */ jal func_800DE3DC +/* B58808 800E1668 0C0378F7 */ jal Audio_Alloc /* B5880C 800E166C 00000000 */ nop /* B58810 800E1670 8E492894 */ lw $t1, 0x2894($s2) /* B58814 800E1674 864B2848 */ lh $t3, 0x2848($s2) @@ -82,8 +82,8 @@ glabel func_800E1618 /* B588E0 800E1740 28810100 */ slti $at, $a0, 0x100 /* B588E4 800E1744 10200009 */ beqz $at, .L800E176C /* B588E8 800E1748 00808825 */ move $s1, $a0 -/* B588EC 800E174C 3C038017 */ lui $v1, %hi(D_8016F280) # $v1, 0x8017 -/* B588F0 800E1750 2463F280 */ addiu $v1, %lo(D_8016F280) # addiu $v1, $v1, -0xd80 +/* B588EC 800E174C 3C038017 */ lui $v1, %hi(gAudioContext+0x100) # $v1, 0x8017 +/* B588F0 800E1750 2463F280 */ addiu $v1, %lo(gAudioContext+0x100) # addiu $v1, $v1, -0xd80 /* B588F4 800E1754 02511021 */ addu $v0, $s2, $s1 .L800E1758: /* B588F8 800E1758 24420001 */ addiu $v0, $v0, 1 @@ -157,8 +157,8 @@ glabel func_800E1618 /* B589F0 800E1850 28810100 */ slti $at, $a0, 0x100 /* B589F4 800E1854 1020000A */ beqz $at, .L800E1880 /* B589F8 800E1858 00808825 */ move $s1, $a0 -/* B589FC 800E185C 3C038017 */ lui $v1, %hi(D_8016F280) # $v1, 0x8017 -/* B58A00 800E1860 2463F280 */ addiu $v1, %lo(D_8016F280) # addiu $v1, $v1, -0xd80 +/* B589FC 800E185C 3C038017 */ lui $v1, %hi(gAudioContext+0x100) # $v1, 0x8017 +/* B58A00 800E1860 2463F280 */ addiu $v1, %lo(gAudioContext+0x100) # addiu $v1, $v1, -0xd80 /* B58A04 800E1864 02511021 */ addu $v0, $s2, $s1 .L800E1868: /* B58A08 800E1868 8E582624 */ lw $t8, 0x2624($s2) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E19A0.s b/asm/non_matchings/code/code_800E11F0/func_800E19A0.s index 1ae602f54c..f752d00eca 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E19A0.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E19A0.s @@ -7,9 +7,9 @@ glabel func_800E19A0 /* B58B54 800E19B4 10000014 */ b .L800E1A08 /* B58B58 800E19B8 24020001 */ li $v0, 1 .L800E19BC: -/* B58B5C 800E19BC 3C0E8017 */ lui $t6, %hi(D_801725B8) +/* B58B5C 800E19BC 3C0E8017 */ lui $t6, %hi(gAudioContext+0x3438) /* B58B60 800E19C0 01C57021 */ addu $t6, $t6, $a1 -/* B58B64 800E19C4 91CE25B8 */ lbu $t6, %lo(D_801725B8)($t6) +/* 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 @@ -18,9 +18,9 @@ glabel func_800E19A0 .L800E19DC: /* B58B7C 800E19DC 0C0389DA */ jal func_800E2768 /* B58B80 800E19E0 24040002 */ li $a0, 2 -/* B58B84 800E19E4 3C0F8017 */ lui $t7, %hi(D_801725B8) +/* B58B84 800E19E4 3C0F8017 */ lui $t7, %hi(gAudioContext+0x3438) /* B58B88 800E19E8 01E27821 */ addu $t7, $t7, $v0 -/* B58B8C 800E19EC 91EF25B8 */ lbu $t7, %lo(D_801725B8)($t7) +/* 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 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1C18.s b/asm/non_matchings/code/code_800E11F0/func_800E1C18.s index e379cb56a4..498c5f278c 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E1C18.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E1C18.s @@ -1,6 +1,6 @@ glabel func_800E1C18 -/* B58DB8 800E1C18 3C0E8017 */ lui $t6, %hi(D_801719C0) # $t6, 0x8017 -/* B58DBC 800E1C1C 95CE19C0 */ lhu $t6, %lo(D_801719C0)($t6) +/* 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 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1C78.s b/asm/non_matchings/code/code_800E11F0/func_800E1C78.s index b4f0474ea3..0e3114fd4e 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E1C78.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E1C78.s @@ -28,12 +28,12 @@ glabel func_800E1C78 .L800E1CE0: /* B58E80 800E1CE0 8E020000 */ lw $v0, ($s0) /* B58E84 800E1CE4 24010001 */ li $at, 1 -/* B58E88 800E1CE8 3C198017 */ lui $t9, %hi(D_801719B8) # $t9, 0x8017 +/* 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(D_801719B8)($t9) +/* 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) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E1F7C.s b/asm/non_matchings/code/code_800E11F0/func_800E1F7C.s index ea8f41cdcb..97271bf264 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E1F7C.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E1F7C.s @@ -33,7 +33,7 @@ glabel func_800E1F7C /* B59194 800E1FF4 0C03880B */ jal func_800E202C /* B59198 800E1FF8 02002025 */ move $a0, $s0 /* B5919C 800E1FFC 02002025 */ move $a0, $s0 -/* B591A0 800E2000 0C038686 */ jal func_800E1A18 +/* B591A0 800E2000 0C038686 */ jal Audio_SetBankLoadStatus /* B591A4 800E2004 00002825 */ move $a1, $zero .L800E2008: /* B591A8 800E2008 5E40FFEE */ bgtzl $s2, .L800E1FC4 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E202C.s b/asm/non_matchings/code/code_800E11F0/func_800E202C.s index f12e334f17..7b9e9928b7 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E202C.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E202C.s @@ -1,27 +1,27 @@ glabel func_800E202C -/* B591CC 800E202C 3C0E8017 */ lui $t6, %hi(D_80171DA2) # $t6, 0x8017 -/* B591D0 800E2030 85CE1DA2 */ lh $t6, %lo(D_80171DA2)($t6) +/* 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(D_80171DA2) # $at, 0x8017 +/* B591E8 800E2048 3C018017 */ lui $at, %hi(gAudioContext+0x2c22) # $at, 0x8017 /* B591EC 800E204C 10000008 */ b .L800E2070 -/* B591F0 800E2050 A42F1DA2 */ sh $t7, %lo(D_80171DA2)($at) +/* B591F0 800E2050 A42F1DA2 */ sh $t7, %lo(gAudioContext+0x2c22)($at) .L800E2054: -/* B591F4 800E2054 3C188017 */ lui $t8, %hi(D_80171DAE) # $t8, 0x8017 -/* B591F8 800E2058 87181DAE */ lh $t8, %lo(D_80171DAE)($t8) +/* 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(D_80171DAE) # $at, 0x8017 +/* 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(D_80171DAE)($at) +/* B5920C 800E206C A4391DAE */ sh $t9, %lo(gAudioContext+0x2c2e)($at) .L800E2070: -/* B59210 800E2070 3C098017 */ lui $t1, %hi(D_80171CB0) # $t1, 0x8017 -/* B59214 800E2074 8D291CB0 */ lw $t1, %lo(D_80171CB0)($t1) -/* B59218 800E2078 3C088017 */ lui $t0, %hi(D_80171CB0) # $t0, 0x8017 -/* B5921C 800E207C 25081CB0 */ addiu $t0, %lo(D_80171CB0) # addiu $t0, $t0, 0x1cb0 +/* 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 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E217C.s b/asm/non_matchings/code/code_800E11F0/func_800E217C.s index a4785bf954..ed07db5896 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E217C.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E217C.s @@ -56,7 +56,7 @@ glabel func_800E217C /* B593E8 800E2248 10000016 */ b .L800E22A4 /* B593EC 800E224C 00001025 */ move $v0, $zero .L800E2250: -/* B593F0 800E2250 0C03B19A */ jal func_800EC668 +/* 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 @@ -75,7 +75,7 @@ glabel func_800E217C /* B59430 800E2290 A2890000 */ sb $t1, ($s4) /* B59434 800E2294 8FAA0030 */ lw $t2, 0x30($sp) /* B59438 800E2298 02802025 */ move $a0, $s4 -/* B5943C 800E229C 0C03B186 */ jal func_800EC618 +/* B5943C 800E229C 0C03B186 */ jal Audio_ProcessSequence /* B59440 800E22A0 A28A0007 */ sb $t2, 7($s4) .L800E22A4: /* B59444 800E22A4 8FBF002C */ lw $ra, 0x2c($sp) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E22C4.s b/asm/non_matchings/code/code_800E11F0/func_800E22C4.s index 02175f7e2e..b91f56cb1a 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E22C4.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E22C4.s @@ -5,9 +5,9 @@ glabel func_800E22C4 /* 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(D_80172618) +/* B5947C 800E22DC 3C0E8017 */ lui $t6, %hi(gAudioContext+0x3498) /* B59480 800E22E0 01C27021 */ addu $t6, $t6, $v0 -/* B59484 800E22E4 91CE2618 */ lbu $t6, %lo(D_80172618)($t6) +/* 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 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E2338.s b/asm/non_matchings/code/code_800E11F0/func_800E2338.s index f035e78192..c818a133ed 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E2338.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E2338.s @@ -18,9 +18,9 @@ glabel func_800E2338 /* 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(D_801725B8) +/* B59524 800E2384 3C0E8017 */ lui $t6, %hi(gAudioContext+0x3438) /* B59528 800E2388 01D07021 */ addu $t6, $t6, $s0 -/* B5952C 800E238C 91CE25B8 */ lbu $t6, %lo(D_801725B8)($t6) +/* 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 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E2558.s b/asm/non_matchings/code/code_800E11F0/func_800E2558.s index 547476fad4..420aed9751 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E2558.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E2558.s @@ -59,7 +59,7 @@ 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 func_800DE8E0 +/* 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 @@ -69,7 +69,7 @@ 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 func_800DE8E0 +/* 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 @@ -79,7 +79,7 @@ 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 func_800DE8E0 +/* 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 @@ -125,12 +125,12 @@ glabel L800E2678 /* B598C0 800E2720 1000000C */ b .L800E2754 /* B598C4 800E2724 02001025 */ move $v0, $s0 .L800E2728: -/* B598C8 800E2728 0C038692 */ jal func_800E1A48 +/* 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 func_800E1A18 +/* B598D8 800E2738 0C038686 */ jal Audio_SetBankLoadStatus /* B598DC 800E273C 8FA4002C */ lw $a0, 0x2c($sp) /* B598E0 800E2740 10000004 */ b .L800E2754 /* B598E4 800E2744 02001025 */ move $v0, $s0 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E27F8.s b/asm/non_matchings/code/code_800E11F0/func_800E27F8.s index 368c50cd60..c14c692c17 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E27F8.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E27F8.s @@ -1,25 +1,25 @@ glabel func_800E27F8 /* B59998 800E27F8 10800009 */ beqz $a0, .L800E2820 -/* B5999C 800E27FC 3C038017 */ lui $v1, %hi(D_801719B0) +/* 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(D_801719B4) +/* 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(D_801719B8) +/* 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(D_801719B0)($v1) +/* B599C4 800E2824 8C6219B0 */ lw $v0, %lo(gAudioContext+0x2830)($v1) .L800E2828: /* B599C8 800E2828 03E00008 */ jr $ra -/* B599CC 800E282C 8C6219B4 */ lw $v0, %lo(D_801719B4)($v1) +/* B599CC 800E282C 8C6219B4 */ lw $v0, %lo(gAudioContext+0x2834)($v1) .L800E2830: -/* B599D0 800E2830 8C6319B8 */ lw $v1, %lo(D_801719B8)($v1) +/* 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_800E283C.s b/asm/non_matchings/code/code_800E11F0/func_800E283C.s index 90fa46a2a1..12d24d197f 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E283C.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E283C.s @@ -1,8 +1,8 @@ glabel func_800E283C /* B599DC 800E283C 27BDFF90 */ addiu $sp, $sp, -0x70 /* B599E0 800E2840 00047080 */ sll $t6, $a0, 2 -/* B599E4 800E2844 3C0F8017 */ lui $t7, %hi(D_801719C4) # $t7, 0x8017 -/* B599E8 800E2848 8DEF19C4 */ lw $t7, %lo(D_801719C4)($t7) +/* B599E4 800E2844 3C0F8017 */ lui $t7, %hi(gAudioContext+0x2844) # $t7, 0x8017 +/* B599E8 800E2848 8DEF19C4 */ lw $t7, %lo(gAudioContext+0x2844)($t7) /* B599EC 800E284C 01C47021 */ addu $t6, $t6, $a0 /* B599F0 800E2850 000E7080 */ sll $t6, $t6, 2 /* B599F4 800E2854 AFBF0034 */ sw $ra, 0x34($sp) @@ -141,21 +141,21 @@ glabel func_800E283C /* B59BD0 800E2A30 5020FFE0 */ beql $at, $zero, .L800E29B4 /* B59BD4 800E2A34 8E420000 */ lw $v0, ($s2) .L800E2A38: -/* B59BD8 800E2A38 3C0E8017 */ lui $t6, %hi(D_801719C4) # $t6, 0x8017 -/* B59BDC 800E2A3C 8DCE19C4 */ lw $t6, %lo(D_801719C4)($t6) +/* B59BD8 800E2A38 3C0E8017 */ lui $t6, %hi(gAudioContext+0x2844) # $t6, 0x8017 +/* B59BDC 800E2A3C 8DCE19C4 */ lw $t6, %lo(gAudioContext+0x2844)($t6) /* B59BE0 800E2A40 8FAF0044 */ lw $t7, 0x44($sp) /* B59BE4 800E2A44 8E6D0000 */ lw $t5, ($s3) -/* B59BE8 800E2A48 3C088017 */ lui $t0, %hi(D_801719C4) # $t0, 0x8017 +/* B59BE8 800E2A48 3C088017 */ lui $t0, %hi(gAudioContext+0x2844) # $t0, 0x8017 /* B59BEC 800E2A4C 01CFC021 */ addu $t8, $t6, $t7 /* B59BF0 800E2A50 AF0D000C */ sw $t5, 0xc($t8) /* B59BF4 800E2A54 8FA90044 */ lw $t1, 0x44($sp) -/* B59BF8 800E2A58 8D0819C4 */ lw $t0, %lo(D_801719C4)($t0) +/* B59BF8 800E2A58 8D0819C4 */ lw $t0, %lo(gAudioContext+0x2844)($t0) /* B59BFC 800E2A5C 8E790004 */ lw $t9, 4($s3) -/* B59C00 800E2A60 3C0C8017 */ lui $t4, %hi(D_801719C4) # $t4, 0x8017 +/* B59C00 800E2A60 3C0C8017 */ lui $t4, %hi(gAudioContext+0x2844) # $t4, 0x8017 /* B59C04 800E2A64 01095021 */ addu $t2, $t0, $t1 /* B59C08 800E2A68 AD590010 */ sw $t9, 0x10($t2) /* B59C0C 800E2A6C 8FAE0044 */ lw $t6, 0x44($sp) -/* B59C10 800E2A70 8D8C19C4 */ lw $t4, %lo(D_801719C4)($t4) +/* B59C10 800E2A70 8D8C19C4 */ lw $t4, %lo(gAudioContext+0x2844)($t4) /* B59C14 800E2A74 266B0008 */ addiu $t3, $s3, 8 /* B59C18 800E2A78 018E7821 */ addu $t7, $t4, $t6 /* B59C1C 800E2A7C ADEB0008 */ sw $t3, 8($t7) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E2AA8.s b/asm/non_matchings/code/code_800E11F0/func_800E2AA8.s index f428e1ee1f..69e6819740 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E2AA8.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E2AA8.s @@ -17,12 +17,12 @@ glabel func_800E2AA8 /* 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(D_80171784) # $s6, 0x8017 +/* 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(D_80171768) # $s3, 0x8017 -/* B59C9C 800E2AFC 26731768 */ addiu $s3, %lo(D_80171768) # addiu $s3, $s3, 0x1768 +/* 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(D_80171784) # addiu $s6, $s6, 0x1784 +/* 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: diff --git a/asm/non_matchings/code/code_800E11F0/func_800E2CE0.s b/asm/non_matchings/code/code_800E11F0/func_800E2CE0.s index ff0b282773..82e9140c1e 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E2CE0.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E2CE0.s @@ -11,16 +11,16 @@ glabel func_800E2CE0 /* 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(D_801725E8) +/* 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(D_801725B8) +/* 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(D_80172618) +/* B59EC8 800E2D28 3C0E8017 */ lui $t6, %hi(gAudioContext+0x3498) /* B59ECC 800E2D2C 01C27021 */ addu $t6, $t6, $v0 -/* B59ED0 800E2D30 91CE2618 */ lbu $t6, %lo(D_80172618)($t6) +/* 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 @@ -31,14 +31,14 @@ glabel func_800E2CE0 /* B59EEC 800E2D4C 02002025 */ move $a0, $s0 .L800E2D50: /* B59EF0 800E2D50 01E27821 */ addu $t7, $t7, $v0 -/* B59EF4 800E2D54 91EF25E8 */ lbu $t7, %lo(D_801725E8)($t7) +/* 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(D_801725B8)($t8) +/* 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 @@ -106,7 +106,7 @@ 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 func_800DE8E0 +/* 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) @@ -116,7 +116,7 @@ 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 func_800DE8E0 +/* 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) @@ -126,7 +126,7 @@ 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 func_800DE8E0 +/* 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) @@ -194,12 +194,12 @@ glabel L800E2EA4 /* B5A144 800E2FA4 1000000C */ b .L800E2FD8 /* B5A148 800E2FA8 8FA2004C */ lw $v0, 0x4c($sp) .L800E2FAC: -/* B5A14C 800E2FAC 0C038692 */ jal func_800E1A48 +/* 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 func_800E1A18 +/* 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) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3094.s b/asm/non_matchings/code/code_800E11F0/func_800E3094.s index 920a56ccef..e5b342177e 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E3094.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E3094.s @@ -50,8 +50,8 @@ glabel func_800E3094 /* 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(D_8016F186) # $a0, 0x8017 -/* B5A2F0 800E3150 2484F186 */ addiu $a0, %lo(D_8016F186) # addiu $a0, $a0, -0xe7a +/* 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: @@ -59,8 +59,8 @@ glabel func_800E3094 /* 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(D_80171768) # $a0, 0x8017 -/* B5A310 800E3170 3C058017 */ lui $a1, %hi(D_80171780) # $a1, 0x8017 +/* 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) @@ -68,26 +68,26 @@ glabel func_800E3094 /* 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(D_80171780) # addiu $a1, $a1, 0x1780 -/* B5A334 800E3194 24841768 */ addiu $a0, %lo(D_80171768) # addiu $a0, $a0, 0x1768 +/* 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(D_80171050) # $a0, 0x8017 -/* B5A344 800E31A4 3C058017 */ lui $a1, %hi(D_80171068) # $a1, 0x8017 -/* B5A348 800E31A8 24A51068 */ addiu $a1, %lo(D_80171068) # addiu $a1, $a1, 0x1068 -/* B5A34C 800E31AC 24841050 */ addiu $a0, %lo(D_80171050) # addiu $a0, $a0, 0x1050 +/* 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(D_80170FA0) # $a0, 0x8017 -/* B5A35C 800E31BC 3C058017 */ lui $a1, %hi(D_80170FB8) # $a1, 0x8017 -/* B5A360 800E31C0 24A50FB8 */ addiu $a1, %lo(D_80170FB8) # addiu $a1, $a1, 0xfb8 -/* B5A364 800E31C4 24840FA0 */ addiu $a0, %lo(D_80170FA0) # addiu $a0, $a0, 0xfa0 +/* 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(D_80170FF8) # $a0, 0x8017 -/* B5A374 800E31D4 3C058017 */ lui $a1, %hi(D_80171010) # $a1, 0x8017 -/* B5A378 800E31D8 24A51010 */ addiu $a1, %lo(D_80171010) # addiu $a1, $a1, 0x1010 -/* B5A37C 800E31DC 24840FF8 */ addiu $a0, %lo(D_80170FF8) # addiu $a0, $a0, 0xff8 +/* 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) @@ -137,17 +137,17 @@ glabel func_800E3094 /* B5A424 800E3284 5420FFF2 */ bnezl $at, .L800E3250 /* B5A428 800E3288 8E2E3524 */ lw $t6, 0x3524($s1) .L800E328C: -/* B5A42C 800E328C 0C03797C */ jal func_800DE5F0 +/* 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(D_80171B30) # $a0, 0x8017 -/* B5A440 800E32A0 24841B30 */ addiu $a0, %lo(D_80171B30) # addiu $a0, $a0, 0x1b30 -/* B5A444 800E32A4 0C0378E0 */ jal func_800DE380 +/* 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(D_8016F18C) # $t0, 0x8017 -/* B5A450 800E32B0 2508F18C */ addiu $t0, %lo(D_8016F18C) # addiu $t0, $t0, -0xe74 +/* 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 @@ -186,13 +186,13 @@ glabel func_800E3094 /* 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(D_80171B30) # $a0, 0x8017 -/* B5A4F0 800E3350 24841B30 */ addiu $a0, %lo(D_80171B30) # addiu $a0, $a0, 0x1b30 +/* 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 func_800DE3DC +/* 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) @@ -207,21 +207,21 @@ glabel func_800E3094 /* B5A530 800E3390 5603FFFB */ bnel $s0, $v1, .L800E3380 /* B5A534 800E3394 02002025 */ move $a0, $s0 .L800E3398: -/* B5A538 800E3398 3C048017 */ lui $a0, %hi(D_80171B30) # $a0, 0x8017 +/* 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 func_800DE3DC -/* B5A548 800E33A8 24841B30 */ addiu $a0, %lo(D_80171B30) # addiu $a0, $a0, 0x1b30 +/* 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(D_80171ED0) # $a0, 0x8017 +/* 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 func_800DE434 -/* B5A56C 800E33CC 24841ED0 */ addiu $a0, %lo(D_80171ED0) # addiu $a0, $a0, 0x1ed0 +/* 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) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E36EC.s b/asm/non_matchings/code/code_800E11F0/func_800E36EC.s index b766d09348..13c9d3091a 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E36EC.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E36EC.s @@ -7,12 +7,12 @@ glabel func_800E36EC /* 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(D_8016F248) # $s7, 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(D_8016F248) # addiu $s7, $s7, -0xdb8 +/* 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 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3A14.s b/asm/non_matchings/code/code_800E11F0/func_800E3A14.s index 248cb21a15..356977ee3f 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E3A14.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E3A14.s @@ -1,7 +1,7 @@ glabel func_800E3A14 /* B5ABB4 800E3A14 3C038017 */ lui $v1, %hi(gAudioContext) # $v1, 0x8017 -/* B5ABB8 800E3A18 3C028017 */ lui $v0, %hi(D_8016F700) # $v0, 0x8017 -/* B5ABBC 800E3A1C 2442F700 */ addiu $v0, %lo(D_8016F700) # addiu $v0, $v0, -0x900 +/* 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 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3A44.s b/asm/non_matchings/code/code_800E11F0/func_800E3A44.s index acf5d06bd9..aa7866177b 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E3A44.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E3A44.s @@ -21,8 +21,8 @@ glabel func_800E3A44 /* B5AC30 800E3A90 10000009 */ b .L800E3AB8 /* B5AC34 800E3A94 00001025 */ move $v0, $zero .L800E3A98: -/* B5AC38 800E3A98 3C048017 */ lui $a0, %hi(D_80170E70) # $a0, 0x8017 -/* B5AC3C 800E3A9C 24840E70 */ addiu $a0, %lo(D_80170E70) # addiu $a0, $a0, 0xe70 +/* 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) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3AC8.s b/asm/non_matchings/code/code_800E11F0/func_800E3AC8.s index d2af700c6d..9250cb61de 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E3AC8.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E3AC8.s @@ -1,10 +1,10 @@ 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(D_8016F700) # $v1, 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(D_8016F700) # addiu $v1, $v1, -0x900 +/* 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: @@ -18,8 +18,8 @@ glabel func_800E3AC8 /* B5ACA0 800E3B00 804E1770 */ lb $t6, 0x1770($v0) /* B5ACA4 800E3B04 8FA3001C */ lw $v1, 0x1c($sp) .L800E3B08: -/* B5ACA8 800E3B08 3C0F8017 */ lui $t7, %hi(D_8016F700) # $t7, 0x8017 -/* B5ACAC 800E3B0C 25EFF700 */ addiu $t7, %lo(D_8016F700) # addiu $t7, $t7, -0x900 +/* 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 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3BEC.s b/asm/non_matchings/code/code_800E11F0/func_800E3BEC.s index 9d21891a56..e9233c0968 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E3BEC.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E3BEC.s @@ -15,9 +15,9 @@ glabel func_800E3BEC /* B5ADC0 800E3C20 1480001D */ bnez $a0, .L800E3C98 /* B5ADC4 800E3C24 00000000 */ nop /* B5ADC8 800E3C28 1260000E */ beqz $s3, .L800E3C64 -/* B5ADCC 800E3C2C 3C108017 */ lui $s0, %hi(D_80170E70) -/* B5ADD0 800E3C30 3C108017 */ lui $s0, %hi(D_80170E70) # $s0, 0x8017 -/* B5ADD4 800E3C34 26100E70 */ addiu $s0, %lo(D_80170E70) # addiu $s0, $s0, 0xe70 +/* 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 @@ -27,11 +27,11 @@ glabel func_800E3BEC /* 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(D_80170EC8) # $a0, 0x8017 +/* B5ADF8 800E3C58 3C048017 */ lui $a0, %hi(gAudioContext+0x1d48) # $a0, 0x8017 /* B5ADFC 800E3C5C 1000000E */ b .L800E3C98 -/* B5AE00 800E3C60 8C840EC8 */ lw $a0, %lo(D_80170EC8)($a0) +/* B5AE00 800E3C60 8C840EC8 */ lw $a0, %lo(gAudioContext+0x1d48)($a0) .L800E3C64: -/* B5AE04 800E3C64 26040E70 */ addiu $a0, $s0, %lo(D_80170E70) +/* 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 @@ -52,8 +52,8 @@ glabel func_800E3BEC /* B5AE44 800E3CA4 02602825 */ move $a1, $s3 .L800E3CA8: /* B5AE48 800E3CA8 3C108017 */ lui $s0, %hi(gAudioContext) # $s0, 0x8017 -/* B5AE4C 800E3CAC 3C128017 */ lui $s2, %hi(D_8016F700) # $s2, 0x8017 -/* B5AE50 800E3CB0 2652F700 */ addiu $s2, %lo(D_8016F700) # addiu $s2, $s2, -0x900 +/* 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) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3D1C.s b/asm/non_matchings/code/code_800E11F0/func_800E3D1C.s index 3a1a593e67..060b81c026 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E3D1C.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E3D1C.s @@ -19,7 +19,7 @@ glabel func_800E3D1C .L800E3D60: /* B5AF00 800E3D60 00032202 */ srl $a0, $v1, 8 /* B5AF04 800E3D64 308400FF */ andi $a0, $a0, 0xff -/* B5AF08 800E3D68 0C038692 */ jal func_800E1A48 +/* 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) @@ -31,8 +31,8 @@ glabel func_800E3D1C /* B5AF28 800E3D88 8E05001C */ lw $a1, 0x1c($s0) .L800E3D8C: /* B5AF2C 800E3D8C 31CF00FF */ andi $t7, $t6, 0xff -/* B5AF30 800E3D90 3C188017 */ lui $t8, %hi(D_801719C4) # $t8, 0x8017 -/* B5AF34 800E3D94 8F1819C4 */ lw $t8, %lo(D_801719C4)($t8) +/* 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 @@ -68,7 +68,7 @@ glabel func_800E3D1C /* B5AFAC 800E3E0C AFA0003C */ sw $zero, 0x3c($sp) .L800E3E10: /* B5AFB0 800E3E10 8FA40028 */ lw $a0, 0x28($sp) -/* B5AFB4 800E3E14 0C038686 */ jal func_800E1A18 +/* 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) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E3E58.s b/asm/non_matchings/code/code_800E11F0/func_800E3E58.s index 9b09ff6835..295ad368a1 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E3E58.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E3E58.s @@ -3,11 +3,11 @@ glabel func_800E3E58 /* 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(D_801719B8) # $v1, 0x8017 +/* 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(D_801719B8)($v1) +/* 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) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E4198.s b/asm/non_matchings/code/code_800E11F0/func_800E4198.s index 3f2e889a70..96582cfc9c 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E4198.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E4198.s @@ -247,12 +247,12 @@ glabel func_800E4198 /* B5B6C0 800E4520 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff /* B5B6C4 800E4524 8E030000 */ lw $v1, ($s0) /* B5B6C8 800E4528 8C450D5C */ lw $a1, 0xd5c($v0) -/* B5B6CC 800E452C 3C0A8017 */ lui $t2, %hi(D_80170FF8) # $t2, 0x8017 +/* B5B6CC 800E452C 3C0A8017 */ lui $t2, %hi(gAudioContext+0x1e78) # $t2, 0x8017 /* B5B6D0 800E4530 00613024 */ and $a2, $v1, $at /* B5B6D4 800E4534 00064302 */ srl $t0, $a2, 0xc /* B5B6D8 800E4538 8E040004 */ lw $a0, 4($s0) /* B5B6DC 800E453C 25080001 */ addiu $t0, $t0, 1 -/* B5B6E0 800E4540 254A0FF8 */ addiu $t2, %lo(D_80170FF8) # addiu $t2, $t2, 0xff8 +/* B5B6E0 800E4540 254A0FF8 */ addiu $t2, %lo(gAudioContext+0x1e78) # addiu $t2, $t2, 0xff8 /* B5B6E4 800E4544 AFAA0014 */ sw $t2, 0x14($sp) /* B5B6E8 800E4548 AFA80010 */ sw $t0, 0x10($sp) /* B5B6EC 800E454C 8C590D60 */ lw $t9, 0xd60($v0) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E4590.s b/asm/non_matchings/code/code_800E11F0/func_800E4590.s index 240004a6da..8f6b11b770 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E4590.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E4590.s @@ -8,8 +8,8 @@ glabel func_800E4590 /* B5B748 800E45A8 AFB00028 */ sw $s0, 0x28($sp) /* B5B74C 800E45AC 1080000B */ beqz $a0, .L800E45DC /* B5B750 800E45B0 27A5004C */ addiu $a1, $sp, 0x4c -/* B5B754 800E45B4 3C048017 */ lui $a0, %hi(D_80170FF8) # $a0, 0x8017 -/* B5B758 800E45B8 24840FF8 */ addiu $a0, %lo(D_80170FF8) # addiu $a0, $a0, 0xff8 +/* B5B754 800E45B4 3C048017 */ lui $a0, %hi(gAudioContext+0x1e78) # $a0, 0x8017 +/* B5B758 800E45B8 24840FF8 */ addiu $a0, %lo(gAudioContext+0x1e78) # addiu $a0, $a0, 0xff8 /* B5B75C 800E45BC 27A5004C */ addiu $a1, $sp, 0x4c /* B5B760 800E45C0 0C000CA0 */ jal osRecvMesg /* B5B764 800E45C4 00003025 */ move $a2, $zero @@ -19,8 +19,8 @@ glabel func_800E4590 /* B5B774 800E45D4 10000056 */ b .L800E4730 /* B5B778 800E45D8 00001025 */ move $v0, $zero .L800E45DC: -/* B5B77C 800E45DC 3C048017 */ lui $a0, %hi(D_80170FF8) # $a0, 0x8017 -/* B5B780 800E45E0 24840FF8 */ addiu $a0, %lo(D_80170FF8) # addiu $a0, $a0, 0xff8 +/* B5B77C 800E45DC 3C048017 */ lui $a0, %hi(gAudioContext+0x1e78) # $a0, 0x8017 +/* B5B780 800E45E0 24840FF8 */ addiu $a0, %lo(gAudioContext+0x1e78) # addiu $a0, $a0, 0xff8 /* B5B784 800E45E4 0C000CA0 */ jal osRecvMesg /* B5B788 800E45E8 00003025 */ move $a2, $zero /* B5B78C 800E45EC 3C078017 */ lui $a3, %hi(gAudioContext) # $a3, 0x8017 @@ -99,8 +99,8 @@ glabel func_800E4590 /* B5B8A0 800E4700 ACED176C */ sw $t5, 0x176c($a3) .L800E4704: /* B5B8A4 800E4704 8C650008 */ lw $a1, 8($v1) -/* B5B8A8 800E4708 3C0F8017 */ lui $t7, %hi(D_80170FF8) # $t7, 0x8017 -/* B5B8AC 800E470C 25EF0FF8 */ addiu $t7, %lo(D_80170FF8) # addiu $t7, $t7, 0xff8 +/* B5B8A8 800E4708 3C0F8017 */ lui $t7, %hi(gAudioContext+0x1e78) # $t7, 0x8017 +/* B5B8AC 800E470C 25EF0FF8 */ addiu $t7, %lo(gAudioContext+0x1e78) # addiu $t7, $t7, 0xff8 /* B5B8B0 800E4710 AFAF0014 */ sw $t7, 0x14($sp) /* B5B8B4 800E4714 AFAA0010 */ sw $t2, 0x10($sp) /* B5B8B8 800E4718 8C78000C */ lw $t8, 0xc($v1) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E478C.s b/asm/non_matchings/code/code_800E11F0/func_800E478C.s index 05dad56bc1..c07d5a3d83 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E478C.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E478C.s @@ -1,7 +1,7 @@ glabel func_800E478C /* B5B92C 800E478C 27BDFFC8 */ addiu $sp, $sp, -0x38 -/* B5B930 800E4790 3C0E8017 */ lui $t6, %hi(D_801719C4) # $t6, 0x8017 -/* B5B934 800E4794 8DCE19C4 */ lw $t6, %lo(D_801719C4)($t6) +/* 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 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E4918.s b/asm/non_matchings/code/code_800E11F0/func_800E4918.s index f9809647d2..5b8ebc89f8 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E4918.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E4918.s @@ -291,12 +291,12 @@ glabel func_800E4918 /* B5BECC 800E4D2C 3421FFFF */ ori $at, (0x00FFFFFF & 0xFFFF) # ori $at, $at, 0xffff /* B5BED0 800E4D30 8E030000 */ lw $v1, ($s0) /* B5BED4 800E4D34 8C450D5C */ lw $a1, 0xd5c($v0) -/* B5BED8 800E4D38 3C0E8017 */ lui $t6, %hi(D_80170FF8) # $t6, 0x8017 +/* B5BED8 800E4D38 3C0E8017 */ lui $t6, %hi(gAudioContext+0x1e78) # $t6, 0x8017 /* B5BEDC 800E4D3C 00613024 */ and $a2, $v1, $at /* B5BEE0 800E4D40 00064B02 */ srl $t1, $a2, 0xc /* B5BEE4 800E4D44 8E040004 */ lw $a0, 4($s0) /* B5BEE8 800E4D48 25290001 */ addiu $t1, $t1, 1 -/* B5BEEC 800E4D4C 25CE0FF8 */ addiu $t6, %lo(D_80170FF8) # addiu $t6, $t6, 0xff8 +/* B5BEEC 800E4D4C 25CE0FF8 */ addiu $t6, %lo(gAudioContext+0x1e78) # addiu $t6, $t6, 0xff8 /* B5BEF0 800E4D50 AFAE0014 */ sw $t6, 0x14($sp) /* B5BEF4 800E4D54 AFA90010 */ sw $t1, 0x10($sp) /* B5BEF8 800E4D58 8C4D0D60 */ lw $t5, 0xd60($v0) diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5000.s b/asm/non_matchings/code/code_800E11F0/func_800E5000.s index 7fd3a05da5..52a3e49105 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E5000.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E5000.s @@ -33,10 +33,10 @@ glabel func_800E5000 /* B5C214 800E5074 24990001 */ addiu $t9, $a0, 1 /* B5C218 800E5078 0040F809 */ jalr $v0 /* B5C21C 800E507C 00000000 */ nop -/* B5C220 800E5080 3C038017 */ lui $v1, %hi(D_801719C8) # $v1, 0x8017 -/* B5C224 800E5084 3C188017 */ lui $t8, %hi(D_80171A1C) # $t8, 0x8017 -/* B5C228 800E5088 8F181A1C */ lw $t8, %lo(D_80171A1C)($t8) -/* B5C22C 800E508C 846319C8 */ lh $v1, %lo(D_801719C8)($v1) +/* B5C220 800E5080 3C038017 */ lui $v1, %hi(gAudioContext+0x2848) # $v1, 0x8017 +/* B5C224 800E5084 3C188017 */ lui $t8, %hi(gAudioContext+0x289c) # $t8, 0x8017 +/* B5C228 800E5088 8F181A1C */ lw $t8, %lo(gAudioContext+0x289c)($t8) +/* B5C22C 800E508C 846319C8 */ lh $v1, %lo(gAudioContext+0x2848)($v1) /* B5C230 800E5090 0303001A */ div $zero, $t8, $v1 /* B5C234 800E5094 00002010 */ mfhi $a0 /* B5C238 800E5098 14600002 */ bnez $v1, .L800E50A4 @@ -126,8 +126,8 @@ glabel func_800E5000 /* B5C360 800E51C0 00000000 */ nop /* B5C364 800E51C4 8E4328A0 */ lw $v1, 0x28a0($s2) .L800E51C8: -/* B5C368 800E51C8 3C118017 */ lui $s1, %hi(D_80171050) # $s1, 0x8017 -/* B5C36C 800E51CC 26311050 */ addiu $s1, %lo(D_80171050) # addiu $s1, $s1, 0x1050 +/* B5C368 800E51C8 3C118017 */ lui $s1, %hi(gAudioContext+0x1ed0) # $s1, 0x8017 +/* B5C36C 800E51CC 26311050 */ addiu $s1, %lo(gAudioContext+0x1ed0) # addiu $s1, $s1, 0x1050 /* B5C370 800E51D0 1860000E */ blez $v1, .L800E520C /* B5C374 800E51D4 00008025 */ move $s0, $zero /* B5C378 800E51D8 02202025 */ move $a0, $s1 @@ -146,9 +146,9 @@ glabel func_800E5000 /* B5C3A4 800E5204 5420FFF5 */ bnezl $at, .L800E51DC /* B5C3A8 800E5208 02202025 */ move $a0, $s1 .L800E520C: -/* B5C3AC 800E520C 3C118017 */ lui $s1, %hi(D_80171050) # $s1, 0x8017 +/* B5C3AC 800E520C 3C118017 */ lui $s1, %hi(gAudioContext+0x1ed0) # $s1, 0x8017 /* B5C3B0 800E5210 1060000C */ beqz $v1, .L800E5244 -/* B5C3B4 800E5214 26311050 */ addiu $s1, %lo(D_80171050) # addiu $s1, $s1, 0x1050 +/* B5C3B4 800E5214 26311050 */ addiu $s1, %lo(gAudioContext+0x1ed0) # addiu $s1, $s1, 0x1050 /* B5C3B8 800E5218 1860000A */ blez $v1, .L800E5244 /* B5C3BC 800E521C 00008025 */ move $s0, $zero /* B5C3C0 800E5220 02202025 */ move $a0, $s1 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5584.s b/asm/non_matchings/code/code_800E11F0/func_800E5584.s index 25efeb0e42..3388cf321e 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E5584.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E5584.s @@ -66,7 +66,7 @@ glabel L800E563C /* B5C810 800E5670 8E050004 */ lw $a1, 4($s0) /* B5C814 800E5674 14A00005 */ bnez $a1, .L800E568C /* B5C818 800E5678 00000000 */ nop -/* B5C81C 800E567C 0C03A6D1 */ jal func_800E9B44 +/* 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) @@ -170,8 +170,8 @@ glabel L800E57D8 /* B5C988 800E57E8 10000057 */ b .L800E5948 /* B5C98C 800E57EC 8FBF001C */ lw $ra, 0x1c($sp) glabel L800E57F0 -/* B5C990 800E57F0 3C078017 */ lui $a3, %hi(D_80170FA0) # $a3, 0x8017 -/* B5C994 800E57F4 24E70FA0 */ addiu $a3, %lo(D_80170FA0) # addiu $a3, $a3, 0xfa0 +/* 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 @@ -179,8 +179,8 @@ glabel L800E57F0 /* B5C9A8 800E5808 1000004F */ b .L800E5948 /* B5C9AC 800E580C 8FBF001C */ lw $ra, 0x1c($sp) glabel L800E5810 -/* B5C9B0 800E5810 3C078017 */ lui $a3, %hi(D_80170FA0) # $a3, 0x8017 -/* B5C9B4 800E5814 24E70FA0 */ addiu $a3, %lo(D_80170FA0) # addiu $a3, $a3, 0xfa0 +/* 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 @@ -188,8 +188,8 @@ glabel L800E5810 /* B5C9C8 800E5828 10000047 */ b .L800E5948 /* B5C9CC 800E582C 8FBF001C */ lw $ra, 0x1c($sp) glabel L800E5830 -/* B5C9D0 800E5830 3C078017 */ lui $a3, %hi(D_80170FA0) # $a3, 0x8017 -/* B5C9D4 800E5834 24E70FA0 */ addiu $a3, %lo(D_80170FA0) # addiu $a3, $a3, 0xfa0 +/* 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 @@ -249,10 +249,10 @@ glabel L800E58C8 /* 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 func_800E9B44 +/* B5CAA8 800E5908 0C03A6D1 */ jal Audio_SequencePlayerDisableAsFinished /* B5CAAC 800E590C AFA50034 */ sw $a1, 0x34($sp) -/* B5CAB0 800E5910 3C028017 */ lui $v0, %hi(D_801719DC) # $v0, 0x8017 -/* B5CAB4 800E5914 844219DC */ lh $v0, %lo(D_801719DC)($v0) +/* 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: diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5E20.s b/asm/non_matchings/code/code_800E11F0/func_800E5E20.s index 3863d6436f..2344f88e9a 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E5E20.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E5E20.s @@ -2,8 +2,8 @@ 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(D_80170FA0) # $a0, 0x8017 -/* B5CFD0 800E5E30 24840FA0 */ addiu $a0, %lo(D_80170FA0) # addiu $a0, $a0, 0xfa0 +/* 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 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E5EDC.s b/asm/non_matchings/code/code_800E11F0/func_800E5EDC.s index ce5d6848a9..eb9f2d4ff8 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E5EDC.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E5EDC.s @@ -12,8 +12,8 @@ glabel func_800E5EDC /* B5D0A4 800E5F04 10000009 */ b .L800E5F2C /* B5D0A8 800E5F08 00001025 */ move $v0, $zero .L800E5F0C: -/* B5D0AC 800E5F0C 3C0F8017 */ lui $t7, %hi(D_80172699) # $t7, 0x8017 -/* B5D0B0 800E5F10 91EF2699 */ lbu $t7, %lo(D_80172699)($t7) +/* 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 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E60C4.s b/asm/non_matchings/code/code_800E11F0/func_800E60C4.s index 13de02de80..e44cf42924 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E60C4.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E60C4.s @@ -5,8 +5,8 @@ glabel func_800E60C4 /* 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(D_80172808) +/* 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(D_80172808)($v0) +/* 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 index 84f79e5cf4..2028272111 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E60EC.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E60EC.s @@ -4,9 +4,9 @@ glabel func_800E60EC /* 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(D_80171B20) # $a0, 0x8017 -/* B5D2A4 800E6104 0C03790D */ jal func_800DE434 -/* B5D2A8 800E6108 24841B20 */ addiu $a0, %lo(D_80171B20) # addiu $a0, $a0, 0x1b20 +/* 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 diff --git a/asm/non_matchings/code/code_800E11F0/func_800E611C.s b/asm/non_matchings/code/code_800E11F0/func_800E611C.s index 3340a07838..2f43f1c779 100644 --- a/asm/non_matchings/code/code_800E11F0/func_800E611C.s +++ b/asm/non_matchings/code/code_800E11F0/func_800E611C.s @@ -1,5 +1,5 @@ glabel func_800E611C -/* B5D2BC 800E611C 3C018017 */ lui $at, %hi(D_80171B20) +/* B5D2BC 800E611C 3C018017 */ lui $at, %hi(gAudioContext+0x29a0) /* B5D2C0 800E6120 03E00008 */ jr $ra -/* B5D2C4 800E6124 AC201B20 */ sw $zero, %lo(D_80171B20)($at) +/* B5D2C4 800E6124 AC201B20 */ sw $zero, %lo(gAudioContext+0x29a0)($at) diff --git a/asm/non_matchings/code/code_800EC960/func_800EE6F4.s b/asm/non_matchings/code/code_800EC960/func_800EE6F4.s index f26bd75d95..e655fc968e 100644 --- a/asm/non_matchings/code/code_800EC960/func_800EE6F4.s +++ b/asm/non_matchings/code/code_800EC960/func_800EE6F4.s @@ -1,8 +1,8 @@ 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(D_80171A1C) # $t6, 0x8017 -/* B658A0 800EE700 8DCE1A1C */ lw $t6, %lo(D_80171A1C)($t6) +/* 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) diff --git a/asm/non_matchings/code/code_800EC960/func_800EEA50.s b/asm/non_matchings/code/code_800EC960/func_800EEA50.s index 15c93680b4..03e9d45abb 100644 --- a/asm/non_matchings/code/code_800EC960/func_800EEA50.s +++ b/asm/non_matchings/code/code_800EC960/func_800EEA50.s @@ -618,8 +618,8 @@ glabel func_800EEA50 /* B65D28 800EEB88 3C0E8013 */ lui $t6, %hi(D_80131F68) # $t6, 0x8013 /* B65D2C 800EEB8C 18800013 */ blez $a0, .L800EEBDC /* B65D30 800EEB90 2718B9E0 */ addiu $t8, %lo(D_8016B9E0) # addiu $t8, $t8, -0x4620 -/* B65D34 800EEB94 3C028017 */ lui $v0, %hi(D_801726AC) # $v0, 0x8017 -/* B65D38 800EEB98 8C4226AC */ lw $v0, %lo(D_801726AC)($v0) +/* B65D34 800EEB94 3C028017 */ lui $v0, %hi(gAudioContext+0x352c) # $v0, 0x8017 +/* B65D38 800EEB98 8C4226AC */ lw $v0, %lo(gAudioContext+0x352c)($v0) /* B65D3C 800EEB9C 24070001 */ li $a3, 1 /* B65D40 800EEBA0 240300E0 */ li $v1, 224 .L800EEBA4: @@ -1368,7 +1368,7 @@ glabel L800EF3F0 /* B66870 800EF6D0 8C590004 */ lw $t9, 4($v0) .L800EF6D4: /* B66874 800EF6D4 8C4F0000 */ lw $t7, ($v0) -/* B66878 800EF6D8 3C038017 */ lui $v1, %hi(D_801729A8) +/* B66878 800EF6D8 3C038017 */ lui $v1, %hi(gAudioContext+0x3828) /* B6687C 800EF6DC C7280000 */ lwc1 $f8, ($t9) /* B66880 800EF6E0 C5E40000 */ lwc1 $f4, ($t7) /* B66884 800EF6E4 3C058015 */ lui $a1, %hi(D_80149EAC) # $a1, 0x8015 @@ -1389,7 +1389,7 @@ glabel L800EF3F0 /* B668C0 800EF720 904F002E */ lbu $t7, 0x2e($v0) /* B668C4 800EF724 000FC080 */ sll $t8, $t7, 2 /* B668C8 800EF728 00781821 */ addu $v1, $v1, $t8 -/* B668CC 800EF72C 8C6329A8 */ lw $v1, %lo(D_801729A8)($v1) +/* B668CC 800EF72C 8C6329A8 */ lw $v1, %lo(gAudioContext+0x3828)($v1) /* B668D0 800EF730 C464002C */ lwc1 $f4, 0x2c($v1) /* B668D4 800EF734 46142182 */ mul.s $f6, $f4, $f20 /* B668D8 800EF738 4600320D */ trunc.w.s $f8, $f6 @@ -1439,7 +1439,7 @@ glabel L800EF3F0 /* B66978 800EF7D8 8C4F0004 */ lw $t7, 4($v0) .L800EF7DC: /* B6697C 800EF7DC 8C4D0000 */ lw $t5, ($v0) -/* B66980 800EF7E0 3C038017 */ lui $v1, %hi(D_801729A8) +/* B66980 800EF7E0 3C038017 */ lui $v1, %hi(gAudioContext+0x3828) /* B66984 800EF7E4 C5F20000 */ lwc1 $f18, ($t7) /* B66988 800EF7E8 C5AA0000 */ lwc1 $f10, ($t5) /* B6698C 800EF7EC 3C058015 */ lui $a1, %hi(D_80149EF0) # $a1, 0x8015 @@ -1460,7 +1460,7 @@ glabel L800EF3F0 /* B669C8 800EF828 904D002E */ lbu $t5, 0x2e($v0) /* B669CC 800EF82C 000D7080 */ sll $t6, $t5, 2 /* B669D0 800EF830 006E1821 */ addu $v1, $v1, $t6 -/* B669D4 800EF834 8C6329A8 */ lw $v1, %lo(D_801729A8)($v1) +/* B669D4 800EF834 8C6329A8 */ lw $v1, %lo(gAudioContext+0x3828)($v1) /* B669D8 800EF838 C46A0038 */ lwc1 $f10, 0x38($v1) /* B669DC 800EF83C 46165402 */ mul.s $f16, $f10, $f22 /* B669E0 800EF840 4600848D */ trunc.w.s $f18, $f16 @@ -2164,7 +2164,7 @@ glabel L800F008C /* B67460 800F02C0 24060007 */ li $a2, 7 /* B67464 800F02C4 92AE0000 */ lbu $t6, ($s5) /* B67468 800F02C8 00168880 */ sll $s1, $s6, 2 -/* B6746C 800F02CC 3C198017 */ lui $t9, %hi(D_801726E8) +/* B6746C 800F02CC 3C198017 */ lui $t9, %hi(gAudioContext+0x3568) /* B67470 800F02D0 000E7880 */ sll $t7, $t6, 2 /* B67474 800F02D4 01EE7823 */ subu $t7, $t7, $t6 /* B67478 800F02D8 000F7880 */ sll $t7, $t7, 2 @@ -2172,7 +2172,7 @@ glabel L800F008C /* B67480 800F02E0 000F7940 */ sll $t7, $t7, 5 /* B67484 800F02E4 01F1C021 */ addu $t8, $t7, $s1 /* B67488 800F02E8 0338C821 */ addu $t9, $t9, $t8 -/* B6748C 800F02EC 8F3926E8 */ lw $t9, %lo(D_801726E8)($t9) +/* B6748C 800F02EC 8F3926E8 */ lw $t9, %lo(gAudioContext+0x3568)($t9) /* B67490 800F02F0 8FA400B0 */ lw $a0, 0xb0($sp) /* B67494 800F02F4 3C058015 */ lui $a1, %hi(D_8014A05C) # $a1, 0x8015 /* B67498 800F02F8 8F2A0000 */ lw $t2, ($t9) @@ -2193,7 +2193,7 @@ glabel L800F008C /* B674CC 800F032C 0C03ED07 */ jal GfxPrint_SetPos /* B674D0 800F0330 24060008 */ li $a2, 8 /* B674D4 800F0334 92AC0000 */ lbu $t4, ($s5) -/* B674D8 800F0338 3C0F8017 */ lui $t7, %hi(D_801726E8) +/* B674D8 800F0338 3C0F8017 */ lui $t7, %hi(gAudioContext+0x3568) /* B674DC 800F033C 8FA400B0 */ lw $a0, 0xb0($sp) /* B674E0 800F0340 000C6880 */ sll $t5, $t4, 2 /* B674E4 800F0344 01AC6823 */ subu $t5, $t5, $t4 @@ -2202,7 +2202,7 @@ glabel L800F008C /* B674F0 800F0350 000D6940 */ sll $t5, $t5, 5 /* B674F4 800F0354 01B17021 */ addu $t6, $t5, $s1 /* B674F8 800F0358 01EE7821 */ addu $t7, $t7, $t6 -/* B674FC 800F035C 8DEF26E8 */ lw $t7, %lo(D_801726E8)($t7) +/* B674FC 800F035C 8DEF26E8 */ lw $t7, %lo(gAudioContext+0x3568)($t7) /* B67500 800F0360 3C058015 */ lui $a1, %hi(D_8014A064) /* B67504 800F0364 8DF80000 */ lw $t8, ($t7) /* B67508 800F0368 001850C0 */ sll $t2, $t8, 3 @@ -2223,7 +2223,7 @@ glabel L800F008C /* B6753C 800F039C 0C03ED07 */ jal GfxPrint_SetPos /* B67540 800F03A0 24060009 */ li $a2, 9 /* B67544 800F03A4 92AB0000 */ lbu $t3, ($s5) -/* B67548 800F03A8 3C028017 */ lui $v0, %hi(D_801726E8) +/* B67548 800F03A8 3C028017 */ lui $v0, %hi(gAudioContext+0x3568) /* B6754C 800F03AC 00008025 */ move $s0, $zero /* B67550 800F03B0 000B6080 */ sll $t4, $t3, 2 /* B67554 800F03B4 018B6023 */ subu $t4, $t4, $t3 @@ -2232,7 +2232,7 @@ glabel L800F008C /* B67560 800F03C0 000C6140 */ sll $t4, $t4, 5 /* B67564 800F03C4 01916821 */ addu $t5, $t4, $s1 /* B67568 800F03C8 004D1021 */ addu $v0, $v0, $t5 -/* B6756C 800F03CC 8C4226E8 */ lw $v0, %lo(D_801726E8)($v0) +/* B6756C 800F03CC 8C4226E8 */ lw $v0, %lo(gAudioContext+0x3568)($v0) /* B67570 800F03D0 00107080 */ sll $t6, $s0, 2 .L800F03D4: /* B67574 800F03D4 004E7821 */ addu $t7, $v0, $t6 @@ -2418,9 +2418,9 @@ glabel L800F008C /* B67838 800F0698 000F7940 */ sll $t7, $t7, 5 /* B6783C 800F069C 0018C880 */ sll $t9, $t8, 2 /* B67840 800F06A0 01F95021 */ addu $t2, $t7, $t9 -/* B67844 800F06A4 3C0B8017 */ lui $t3, %hi(D_801726E8) +/* B67844 800F06A4 3C0B8017 */ lui $t3, %hi(gAudioContext+0x3568) /* B67848 800F06A8 016A5821 */ addu $t3, $t3, $t2 -/* B6784C 800F06AC 8D6B26E8 */ lw $t3, %lo(D_801726E8)($t3) +/* B6784C 800F06AC 8D6B26E8 */ lw $t3, %lo(gAudioContext+0x3568)($t3) /* B67850 800F06B0 8FA400B0 */ lw $a0, 0xb0($sp) /* B67854 800F06B4 02002825 */ move $a1, $s0 /* B67858 800F06B8 01766021 */ addu $t4, $t3, $s6 @@ -2441,9 +2441,9 @@ glabel L800F008C /* B67894 800F06F4 000E7140 */ sll $t6, $t6, 5 /* B67898 800F06F8 00187880 */ sll $t7, $t8, 2 /* B6789C 800F06FC 01CFC821 */ addu $t9, $t6, $t7 -/* B678A0 800F0700 3C0A8017 */ lui $t2, %hi(D_801726E8) +/* B678A0 800F0700 3C0A8017 */ lui $t2, %hi(gAudioContext+0x3568) /* B678A4 800F0704 01595021 */ addu $t2, $t2, $t9 -/* B678A8 800F0708 8D4A26E8 */ lw $t2, %lo(D_801726E8)($t2) +/* B678A8 800F0708 8D4A26E8 */ lw $t2, %lo(gAudioContext+0x3568)($t2) /* B678AC 800F070C 8FA400B0 */ lw $a0, 0xb0($sp) /* B678B0 800F0710 2405000F */ li $a1, 15 /* B678B4 800F0714 8D4B0000 */ lw $t3, ($t2) @@ -2462,9 +2462,9 @@ glabel L800F008C /* B678E8 800F0748 0018C140 */ sll $t8, $t8, 5 /* B678EC 800F074C 000E7880 */ sll $t7, $t6, 2 /* B678F0 800F0750 030FC821 */ addu $t9, $t8, $t7 -/* B678F4 800F0754 3C0A8017 */ lui $t2, %hi(D_801726E8) +/* B678F4 800F0754 3C0A8017 */ lui $t2, %hi(gAudioContext+0x3568) /* B678F8 800F0758 01595021 */ addu $t2, $t2, $t9 -/* B678FC 800F075C 8D4A26E8 */ lw $t2, %lo(D_801726E8)($t2) +/* B678FC 800F075C 8D4A26E8 */ lw $t2, %lo(gAudioContext+0x3568)($t2) /* B67900 800F0760 3C018015 */ lui $at, %hi(D_8014A4C8) /* B67904 800F0764 D434A4C8 */ ldc1 $f20, %lo(D_8014A4C8)($at) /* B67908 800F0768 C544002C */ lwc1 $f4, 0x2c($t2) @@ -2525,9 +2525,9 @@ glabel L800F008C /* B679D8 800F0838 000D6940 */ sll $t5, $t5, 5 /* B679DC 800F083C 000EC080 */ sll $t8, $t6, 2 /* B679E0 800F0840 01B87821 */ addu $t7, $t5, $t8 -/* B679E4 800F0844 3C198017 */ lui $t9, %hi(D_801726E8) +/* B679E4 800F0844 3C198017 */ lui $t9, %hi(gAudioContext+0x3568) /* B679E8 800F0848 032FC821 */ addu $t9, $t9, $t7 -/* B679EC 800F084C 8F3926E8 */ lw $t9, %lo(D_801726E8)($t9) +/* B679EC 800F084C 8F3926E8 */ lw $t9, %lo(gAudioContext+0x3568)($t9) /* B679F0 800F0850 24060001 */ li $a2, 1 /* B679F4 800F0854 3C058015 */ lui $a1, %hi(D_8014A10C) /* B679F8 800F0858 C7300028 */ lwc1 $f16, 0x28($t9) @@ -2586,9 +2586,9 @@ glabel L800F008C /* B67AC0 800F0920 000C6140 */ sll $t4, $t4, 5 /* B67AC4 800F0924 000E6880 */ sll $t5, $t6, 2 /* B67AC8 800F0928 018DC021 */ addu $t8, $t4, $t5 -/* B67ACC 800F092C 3C0F8017 */ lui $t7, %hi(D_801726E8) +/* B67ACC 800F092C 3C0F8017 */ lui $t7, %hi(gAudioContext+0x3568) /* B67AD0 800F0930 01F87821 */ addu $t7, $t7, $t8 -/* B67AD4 800F0934 8DEF26E8 */ lw $t7, %lo(D_801726E8)($t7) +/* B67AD4 800F0934 8DEF26E8 */ lw $t7, %lo(gAudioContext+0x3568)($t7) /* B67AD8 800F0938 3C058015 */ lui $a1, %hi(D_8014A110) # $a1, 0x8015 /* B67ADC 800F093C 24A5A110 */ addiu $a1, %lo(D_8014A110) # addiu $a1, $a1, -0x5ef0 /* B67AE0 800F0940 8FA400B0 */ lw $a0, 0xb0($sp) @@ -2604,9 +2604,9 @@ glabel L800F008C /* B67B08 800F0968 000A5140 */ sll $t2, $t2, 5 /* B67B0C 800F096C 000B7080 */ sll $t6, $t3, 2 /* B67B10 800F0970 014E6021 */ addu $t4, $t2, $t6 -/* B67B14 800F0974 3C0D8017 */ lui $t5, %hi(D_801726E8) +/* B67B14 800F0974 3C0D8017 */ lui $t5, %hi(gAudioContext+0x3568) /* B67B18 800F0978 01AC6821 */ addu $t5, $t5, $t4 -/* B67B1C 800F097C 8DAD26E8 */ lw $t5, %lo(D_801726E8)($t5) +/* B67B1C 800F097C 8DAD26E8 */ lw $t5, %lo(gAudioContext+0x3568)($t5) /* B67B20 800F0980 8FA400B0 */ lw $a0, 0xb0($sp) /* B67B24 800F0984 2405000F */ li $a1, 15 /* B67B28 800F0988 91B20025 */ lbu $s2, 0x25($t5) @@ -2643,9 +2643,9 @@ glabel L800F008C /* B67B9C 800F09FC 000F7940 */ sll $t7, $t7, 5 /* B67BA0 800F0A00 00195880 */ sll $t3, $t9, 2 /* B67BA4 800F0A04 01EB5021 */ addu $t2, $t7, $t3 -/* B67BA8 800F0A08 3C0E8017 */ lui $t6, %hi(D_801726E8) +/* B67BA8 800F0A08 3C0E8017 */ lui $t6, %hi(gAudioContext+0x3568) /* B67BAC 800F0A0C 01CA7021 */ addu $t6, $t6, $t2 -/* B67BB0 800F0A10 8DCE26E8 */ lw $t6, %lo(D_801726E8)($t6) +/* B67BB0 800F0A10 8DCE26E8 */ lw $t6, %lo(gAudioContext+0x3568)($t6) /* B67BB4 800F0A14 3C058015 */ lui $a1, %hi(D_8014A118) # $a1, 0x8015 /* B67BB8 800F0A18 24A5A118 */ addiu $a1, %lo(D_8014A118) # addiu $a1, $a1, -0x5ee8 /* B67BBC 800F0A1C 8FA400B0 */ lw $a0, 0xb0($sp) @@ -2665,9 +2665,9 @@ glabel L800F008C /* B67BF4 800F0A54 000D6940 */ sll $t5, $t5, 5 /* B67BF8 800F0A58 0018C880 */ sll $t9, $t8, 2 /* B67BFC 800F0A5C 01B97821 */ addu $t7, $t5, $t9 -/* B67C00 800F0A60 3C0B8017 */ lui $t3, %hi(D_801726E8) +/* B67C00 800F0A60 3C0B8017 */ lui $t3, %hi(gAudioContext+0x3568) /* B67C04 800F0A64 016F5821 */ addu $t3, $t3, $t7 -/* B67C08 800F0A68 8D6B26E8 */ lw $t3, %lo(D_801726E8)($t3) +/* B67C08 800F0A68 8D6B26E8 */ lw $t3, %lo(gAudioContext+0x3568)($t3) /* B67C0C 800F0A6C 3C058015 */ lui $a1, %hi(D_8014A11C) # $a1, 0x8015 /* B67C10 800F0A70 24A5A11C */ addiu $a1, %lo(D_8014A11C) # addiu $a1, $a1, -0x5ee4 /* B67C14 800F0A74 8FA400B0 */ lw $a0, 0xb0($sp) @@ -2687,9 +2687,9 @@ glabel L800F008C /* B67C4C 800F0AAC 000E7140 */ sll $t6, $t6, 5 /* B67C50 800F0AB0 000CC080 */ sll $t8, $t4, 2 /* B67C54 800F0AB4 01D86821 */ addu $t5, $t6, $t8 -/* B67C58 800F0AB8 3C198017 */ lui $t9, %hi(D_801726E8) +/* B67C58 800F0AB8 3C198017 */ lui $t9, %hi(gAudioContext+0x3568) /* B67C5C 800F0ABC 032DC821 */ addu $t9, $t9, $t5 -/* B67C60 800F0AC0 8F3926E8 */ lw $t9, %lo(D_801726E8)($t9) +/* B67C60 800F0AC0 8F3926E8 */ lw $t9, %lo(gAudioContext+0x3568)($t9) /* B67C64 800F0AC4 3C058015 */ lui $a1, %hi(D_8014A120) # $a1, 0x8015 /* B67C68 800F0AC8 24A5A120 */ addiu $a1, %lo(D_8014A120) # addiu $a1, $a1, -0x5ee0 /* B67C6C 800F0ACC 8FA400B0 */ lw $a0, 0xb0($sp) @@ -2709,9 +2709,9 @@ glabel L800F008C /* B67CA4 800F0B04 000B5940 */ sll $t3, $t3, 5 /* B67CA8 800F0B08 000A6080 */ sll $t4, $t2, 2 /* B67CAC 800F0B0C 016C7021 */ addu $t6, $t3, $t4 -/* B67CB0 800F0B10 3C188017 */ lui $t8, %hi(D_801726E8) +/* B67CB0 800F0B10 3C188017 */ lui $t8, %hi(gAudioContext+0x3568) /* B67CB4 800F0B14 030EC021 */ addu $t8, $t8, $t6 -/* B67CB8 800F0B18 8F1826E8 */ lw $t8, %lo(D_801726E8)($t8) +/* B67CB8 800F0B18 8F1826E8 */ lw $t8, %lo(gAudioContext+0x3568)($t8) /* B67CBC 800F0B1C 3C058015 */ lui $a1, %hi(D_8014A124) # $a1, 0x8015 /* B67CC0 800F0B20 24A5A124 */ addiu $a1, %lo(D_8014A124) # addiu $a1, $a1, -0x5edc /* B67CC4 800F0B24 8FA400B0 */ lw $a0, 0xb0($sp) @@ -2731,9 +2731,9 @@ glabel L800F008C /* B67CFC 800F0B5C 0019C940 */ sll $t9, $t9, 5 /* B67D00 800F0B60 000F5080 */ sll $t2, $t7, 2 /* B67D04 800F0B64 032A5821 */ addu $t3, $t9, $t2 -/* B67D08 800F0B68 3C0C8017 */ lui $t4, %hi(D_801726E8) +/* B67D08 800F0B68 3C0C8017 */ lui $t4, %hi(gAudioContext+0x3568) /* B67D0C 800F0B6C 018B6021 */ addu $t4, $t4, $t3 -/* B67D10 800F0B70 8D8C26E8 */ lw $t4, %lo(D_801726E8)($t4) +/* B67D10 800F0B70 8D8C26E8 */ lw $t4, %lo(gAudioContext+0x3568)($t4) /* B67D14 800F0B74 3C058015 */ lui $a1, %hi(D_8014A128) # $a1, 0x8015 /* B67D18 800F0B78 24A5A128 */ addiu $a1, %lo(D_8014A128) # addiu $a1, $a1, -0x5ed8 /* B67D1C 800F0B7C 95860014 */ lhu $a2, 0x14($t4) @@ -2759,9 +2759,9 @@ glabel L800F008C /* B67D68 800F0BC8 0018C140 */ sll $t8, $t8, 5 /* B67D6C 800F0BCC 000D7880 */ sll $t7, $t5, 2 /* B67D70 800F0BD0 030FC821 */ addu $t9, $t8, $t7 -/* B67D74 800F0BD4 3C0A8017 */ lui $t2, %hi(D_801726E8) +/* B67D74 800F0BD4 3C0A8017 */ lui $t2, %hi(gAudioContext+0x3568) /* B67D78 800F0BD8 01595021 */ addu $t2, $t2, $t9 -/* B67D7C 800F0BDC 8D4A26E8 */ lw $t2, %lo(D_801726E8)($t2) +/* B67D7C 800F0BDC 8D4A26E8 */ lw $t2, %lo(gAudioContext+0x3568)($t2) /* B67D80 800F0BE0 3C058015 */ lui $a1, %hi(D_8014A12C) # $a1, 0x8015 /* B67D84 800F0BE4 24A5A12C */ addiu $a1, %lo(D_8014A12C) # addiu $a1, $a1, -0x5ed4 /* B67D88 800F0BE8 95460016 */ lhu $a2, 0x16($t2) @@ -2787,9 +2787,9 @@ glabel L800F008C /* B67DD4 800F0C34 000C6140 */ sll $t4, $t4, 5 /* B67DD8 800F0C38 000E6880 */ sll $t5, $t6, 2 /* B67DDC 800F0C3C 018DC021 */ addu $t8, $t4, $t5 -/* B67DE0 800F0C40 3C0F8017 */ lui $t7, %hi(D_801726E8) +/* B67DE0 800F0C40 3C0F8017 */ lui $t7, %hi(gAudioContext+0x3568) /* B67DE4 800F0C44 01F87821 */ addu $t7, $t7, $t8 -/* B67DE8 800F0C48 8DEF26E8 */ lw $t7, %lo(D_801726E8)($t7) +/* B67DE8 800F0C48 8DEF26E8 */ lw $t7, %lo(gAudioContext+0x3568)($t7) /* B67DEC 800F0C4C 3C0142C8 */ li $at, 0x42C80000 # 0.000000 /* B67DF0 800F0C50 44815000 */ mtc1 $at, $f10 /* B67DF4 800F0C54 C5E80038 */ lwc1 $f8, 0x38($t7) @@ -2873,13 +2873,13 @@ glabel L800F0CFC /* B67F1C 800F0D7C 24050003 */ li $a1, 3 /* B67F20 800F0D80 0C03ED07 */ jal GfxPrint_SetPos /* B67F24 800F0D84 24060005 */ li $a2, 5 -/* B67F28 800F0D88 3C0B8017 */ lui $t3, %hi(D_80171B44) # $t3, 0x8017 -/* B67F2C 800F0D8C 3C0E8017 */ lui $t6, %hi(D_80171B40) # $t6, 0x8017 -/* B67F30 800F0D90 8DCE1B40 */ lw $t6, %lo(D_80171B40)($t6) -/* B67F34 800F0D94 8D6B1B44 */ lw $t3, %lo(D_80171B44)($t3) +/* B67F28 800F0D88 3C0B8017 */ lui $t3, %hi(gAudioContext+0x29c4) # $t3, 0x8017 +/* B67F2C 800F0D8C 3C0E8017 */ lui $t6, %hi(gAudioContext+0x29c0) # $t6, 0x8017 +/* B67F30 800F0D90 8DCE1B40 */ lw $t6, %lo(gAudioContext+0x29c0)($t6) +/* B67F34 800F0D94 8D6B1B44 */ lw $t3, %lo(gAudioContext+0x29c4)($t3) /* B67F38 800F0D98 3C058015 */ lui $a1, %hi(D_8014A140) # $a1, 0x8015 -/* B67F3C 800F0D9C 3C078017 */ lui $a3, %hi(D_80171B48) # $a3, 0x8017 -/* B67F40 800F0DA0 8CE71B48 */ lw $a3, %lo(D_80171B48)($a3) +/* B67F3C 800F0D9C 3C078017 */ lui $a3, %hi(gAudioContext+0x29c8) # $a3, 0x8017 +/* B67F40 800F0DA0 8CE71B48 */ lw $a3, %lo(gAudioContext+0x29c8)($a3) /* B67F44 800F0DA4 24A5A140 */ addiu $a1, %lo(D_8014A140) # addiu $a1, $a1, -0x5ec0 /* B67F48 800F0DA8 8FA400B0 */ lw $a0, 0xb0($sp) /* B67F4C 800F0DAC 0C03EF2D */ jal GfxPrint_Printf @@ -2888,17 +2888,17 @@ glabel L800F0CFC /* B67F58 800F0DB8 24050003 */ li $a1, 3 /* B67F5C 800F0DBC 0C03ED07 */ jal GfxPrint_SetPos /* B67F60 800F0DC0 24060006 */ li $a2, 6 -/* B67F64 800F0DC4 3C0C8017 */ lui $t4, %hi(D_80171C8C) # $t4, 0x8017 -/* B67F68 800F0DC8 3C0D8017 */ lui $t5, %hi(D_80171C98) # $t5, 0x8017 -/* B67F6C 800F0DCC 3C188017 */ lui $t8, %hi(D_80171C80) # $t8, 0x8017 -/* B67F70 800F0DD0 8F181C80 */ lw $t8, %lo(D_80171C80)($t8) -/* B67F74 800F0DD4 8DAD1C98 */ lw $t5, %lo(D_80171C98)($t5) -/* B67F78 800F0DD8 8D8C1C8C */ lw $t4, %lo(D_80171C8C)($t4) +/* B67F64 800F0DC4 3C0C8017 */ lui $t4, %hi(gAudioContext+0x2b0c) # $t4, 0x8017 +/* B67F68 800F0DC8 3C0D8017 */ lui $t5, %hi(gAudioContext+0x2b18) # $t5, 0x8017 +/* B67F6C 800F0DCC 3C188017 */ lui $t8, %hi(gAudioContext+0x2b00) # $t8, 0x8017 +/* B67F70 800F0DD0 8F181C80 */ lw $t8, %lo(gAudioContext+0x2b00)($t8) +/* B67F74 800F0DD4 8DAD1C98 */ lw $t5, %lo(gAudioContext+0x2b18)($t5) +/* B67F78 800F0DD8 8D8C1C8C */ lw $t4, %lo(gAudioContext+0x2b0c)($t4) /* B67F7C 800F0DDC 3C058015 */ lui $a1, %hi(D_8014A154) # $a1, 0x8015 -/* B67F80 800F0DE0 3C068017 */ lui $a2, %hi(D_80171C93) # $a2, 0x8017 -/* B67F84 800F0DE4 3C078017 */ lui $a3, %hi(D_80171C9F) # $a3, 0x8017 -/* B67F88 800F0DE8 90E71C9F */ lbu $a3, %lo(D_80171C9F)($a3) -/* B67F8C 800F0DEC 90C61C93 */ lbu $a2, %lo(D_80171C93)($a2) +/* B67F80 800F0DE0 3C068017 */ lui $a2, %hi(gAudioContext+0x2b13) # $a2, 0x8017 +/* B67F84 800F0DE4 3C078017 */ lui $a3, %hi(gAudioContext+0x2b1f) # $a3, 0x8017 +/* B67F88 800F0DE8 90E71C9F */ lbu $a3, %lo(gAudioContext+0x2b1f)($a3) +/* B67F8C 800F0DEC 90C61C93 */ lbu $a2, %lo(gAudioContext+0x2b13)($a2) /* B67F90 800F0DF0 24A5A154 */ addiu $a1, %lo(D_8014A154) # addiu $a1, $a1, -0x5eac /* B67F94 800F0DF4 8FA400B0 */ lw $a0, 0xb0($sp) /* B67F98 800F0DF8 AFB80018 */ sw $t8, 0x18($sp) @@ -2909,17 +2909,17 @@ glabel L800F0CFC /* B67FAC 800F0E0C 24050003 */ li $a1, 3 /* B67FB0 800F0E10 0C03ED07 */ jal GfxPrint_SetPos /* B67FB4 800F0E14 24060007 */ li $a2, 7 -/* B67FB8 800F0E18 3C0F8017 */ lui $t7, %hi(D_80171D9C) # $t7, 0x8017 -/* B67FBC 800F0E1C 3C198017 */ lui $t9, %hi(D_80171DA8) # $t9, 0x8017 -/* B67FC0 800F0E20 3C0A8017 */ lui $t2, %hi(D_80171D90) # $t2, 0x8017 -/* B67FC4 800F0E24 8D4A1D90 */ lw $t2, %lo(D_80171D90)($t2) -/* B67FC8 800F0E28 8F391DA8 */ lw $t9, %lo(D_80171DA8)($t9) -/* B67FCC 800F0E2C 8DEF1D9C */ lw $t7, %lo(D_80171D9C)($t7) +/* B67FB8 800F0E18 3C0F8017 */ lui $t7, %hi(gAudioContext+0x2c1c) # $t7, 0x8017 +/* B67FBC 800F0E1C 3C198017 */ lui $t9, %hi(gAudioContext+0x2c28) # $t9, 0x8017 +/* B67FC0 800F0E20 3C0A8017 */ lui $t2, %hi(gAudioContext+0x2c10) # $t2, 0x8017 +/* B67FC4 800F0E24 8D4A1D90 */ lw $t2, %lo(gAudioContext+0x2c10)($t2) +/* B67FC8 800F0E28 8F391DA8 */ lw $t9, %lo(gAudioContext+0x2c28)($t9) +/* B67FCC 800F0E2C 8DEF1D9C */ lw $t7, %lo(gAudioContext+0x2c1c)($t7) /* B67FD0 800F0E30 3C058015 */ lui $a1, %hi(D_8014A178) # $a1, 0x8015 -/* B67FD4 800F0E34 3C068017 */ lui $a2, %hi(D_80171DA3) # $a2, 0x8017 -/* B67FD8 800F0E38 3C078017 */ lui $a3, %hi(D_80171DAF) # $a3, 0x8017 -/* B67FDC 800F0E3C 90E71DAF */ lbu $a3, %lo(D_80171DAF)($a3) -/* B67FE0 800F0E40 90C61DA3 */ lbu $a2, %lo(D_80171DA3)($a2) +/* B67FD4 800F0E34 3C068017 */ lui $a2, %hi(gAudioContext+0x2c23) # $a2, 0x8017 +/* B67FD8 800F0E38 3C078017 */ lui $a3, %hi(gAudioContext+0x2c2f) # $a3, 0x8017 +/* B67FDC 800F0E3C 90E71DAF */ lbu $a3, %lo(gAudioContext+0x2c2f)($a3) +/* B67FE0 800F0E40 90C61DA3 */ lbu $a2, %lo(gAudioContext+0x2c23)($a2) /* B67FE4 800F0E44 24A5A178 */ addiu $a1, %lo(D_8014A178) # addiu $a1, $a1, -0x5e88 /* B67FE8 800F0E48 8FA400B0 */ lw $a0, 0xb0($sp) /* B67FEC 800F0E4C AFAA0018 */ sw $t2, 0x18($sp) @@ -2930,22 +2930,22 @@ glabel L800F0CFC /* B68000 800F0E60 24050003 */ li $a1, 3 /* B68004 800F0E64 0C03ED07 */ jal GfxPrint_SetPos /* B68008 800F0E68 24060008 */ li $a2, 8 -/* B6800C 800F0E6C 3C0B8017 */ lui $t3, %hi(D_80171BA8) # $t3, 0x8017 -/* B68010 800F0E70 3C0E8017 */ lui $t6, %hi(D_80171BA4) # $t6, 0x8017 -/* B68014 800F0E74 3C0C8017 */ lui $t4, %hi(D_80171BAC) # $t4, 0x8017 -/* B68018 800F0E78 8D8C1BAC */ lw $t4, %lo(D_80171BAC)($t4) -/* B6801C 800F0E7C 8DCE1BA4 */ lw $t6, %lo(D_80171BA4)($t6) -/* B68020 800F0E80 8D6B1BA8 */ lw $t3, %lo(D_80171BA8)($t3) +/* B6800C 800F0E6C 3C0B8017 */ lui $t3, %hi(gAudioContext+0x2a28) # $t3, 0x8017 +/* B68010 800F0E70 3C0E8017 */ lui $t6, %hi(gAudioContext+0x2a24) # $t6, 0x8017 +/* B68014 800F0E74 3C0C8017 */ lui $t4, %hi(gAudioContext+0x2a2c) # $t4, 0x8017 +/* B68018 800F0E78 8D8C1BAC */ lw $t4, %lo(gAudioContext+0x2a2c)($t4) +/* B6801C 800F0E7C 8DCE1BA4 */ lw $t6, %lo(gAudioContext+0x2a24)($t6) +/* B68020 800F0E80 8D6B1BA8 */ lw $t3, %lo(gAudioContext+0x2a28)($t3) /* B68024 800F0E84 3C058015 */ lui $a1, %hi(D_8014A19C) # $a1, 0x8015 -/* B68028 800F0E88 3C068017 */ lui $a2, %hi(D_80171BA0) # $a2, 0x8017 -/* B6802C 800F0E8C 8CC61BA0 */ lw $a2, %lo(D_80171BA0)($a2) +/* B68028 800F0E88 3C068017 */ lui $a2, %hi(gAudioContext+0x2a20) # $a2, 0x8017 +/* B6802C 800F0E8C 8CC61BA0 */ lw $a2, %lo(gAudioContext+0x2a20)($a2) /* B68030 800F0E90 24A5A19C */ addiu $a1, %lo(D_8014A19C) # addiu $a1, $a1, -0x5e64 /* B68034 800F0E94 8FA400B0 */ lw $a0, 0xb0($sp) /* B68038 800F0E98 AFAC0010 */ sw $t4, 0x10($sp) /* B6803C 800F0E9C 0C03EF2D */ jal GfxPrint_Printf /* B68040 800F0EA0 016E3823 */ subu $a3, $t3, $t6 -/* B68044 800F0EA4 3C0D8017 */ lui $t5, %hi(D_80171BA0) # $t5, 0x8017 -/* B68048 800F0EA8 8DAD1BA0 */ lw $t5, %lo(D_80171BA0)($t5) +/* B68044 800F0EA4 3C0D8017 */ lui $t5, %hi(gAudioContext+0x2a20) # $t5, 0x8017 +/* B68048 800F0EA8 8DAD1BA0 */ lw $t5, %lo(gAudioContext+0x2a20)($t5) /* B6804C 800F0EAC 3C108015 */ lui $s0, %hi(D_8014A1BC) # $s0, 0x8015 /* B68050 800F0EB0 2610A1BC */ addiu $s0, %lo(D_8014A1BC) # addiu $s0, $s0, -0x5e44 /* B68054 800F0EB4 11A00018 */ beqz $t5, .L800F0F18 @@ -2958,15 +2958,15 @@ glabel L800F0CFC /* B6806C 800F0ECC 0C03ED07 */ jal GfxPrint_SetPos /* B68070 800F0ED0 24060009 */ li $a2, 9 /* B68074 800F0ED4 02510019 */ multu $s2, $s1 -/* B68078 800F0ED8 3C068017 */ lui $a2, %hi(D_80171BBE) +/* B68078 800F0ED8 3C068017 */ lui $a2, %hi(gAudioContext+0x2a3e) /* B6807C 800F0EDC 8FA400B0 */ lw $a0, 0xb0($sp) /* B68080 800F0EE0 02002825 */ move $a1, $s0 /* B68084 800F0EE4 0000C012 */ mflo $t8 /* B68088 800F0EE8 00D83021 */ addu $a2, $a2, $t8 /* B6808C 800F0EEC 0C03EF2D */ jal GfxPrint_Printf -/* B68090 800F0EF0 84C61BBE */ lh $a2, %lo(D_80171BBE)($a2) -/* B68094 800F0EF4 3C0F8017 */ lui $t7, %hi(D_80171BA0) # $t7, 0x8017 -/* B68098 800F0EF8 8DEF1BA0 */ lw $t7, %lo(D_80171BA0)($t7) +/* B68090 800F0EF0 84C61BBE */ lh $a2, %lo(gAudioContext+0x2a3e)($a2) +/* B68094 800F0EF4 3C0F8017 */ lui $t7, %hi(gAudioContext+0x2a20) # $t7, 0x8017 +/* B68098 800F0EF8 8DEF1BA0 */ lw $t7, %lo(gAudioContext+0x2a20)($t7) /* B6809C 800F0EFC 26520001 */ addiu $s2, $s2, 1 /* B680A0 800F0F00 00129600 */ sll $s2, $s2, 0x18 /* B680A4 800F0F04 00129603 */ sra $s2, $s2, 0x18 @@ -2980,22 +2980,22 @@ glabel L800F0CFC /* B680C0 800F0F20 24050003 */ li $a1, 3 /* B680C4 800F0F24 0C03ED07 */ jal GfxPrint_SetPos /* B680C8 800F0F28 2406000A */ li $a2, 10 -/* B680CC 800F0F2C 3C198017 */ lui $t9, %hi(D_80171CB8) # $t9, 0x8017 -/* B680D0 800F0F30 3C0A8017 */ lui $t2, %hi(D_80171CB4) # $t2, 0x8017 -/* B680D4 800F0F34 3C0B8017 */ lui $t3, %hi(D_80171CBC) # $t3, 0x8017 -/* B680D8 800F0F38 8D6B1CBC */ lw $t3, %lo(D_80171CBC)($t3) -/* B680DC 800F0F3C 8D4A1CB4 */ lw $t2, %lo(D_80171CB4)($t2) -/* B680E0 800F0F40 8F391CB8 */ lw $t9, %lo(D_80171CB8)($t9) +/* B680CC 800F0F2C 3C198017 */ lui $t9, %hi(gAudioContext+0x2b38) # $t9, 0x8017 +/* B680D0 800F0F30 3C0A8017 */ lui $t2, %hi(gAudioContext+0x2b34) # $t2, 0x8017 +/* B680D4 800F0F34 3C0B8017 */ lui $t3, %hi(gAudioContext+0x2b3c) # $t3, 0x8017 +/* B680D8 800F0F38 8D6B1CBC */ lw $t3, %lo(gAudioContext+0x2b3c)($t3) +/* B680DC 800F0F3C 8D4A1CB4 */ lw $t2, %lo(gAudioContext+0x2b34)($t2) +/* B680E0 800F0F40 8F391CB8 */ lw $t9, %lo(gAudioContext+0x2b38)($t9) /* B680E4 800F0F44 3C058015 */ lui $a1, %hi(D_8014A1C4) # $a1, 0x8015 -/* B680E8 800F0F48 3C068017 */ lui $a2, %hi(D_80171CB0) # $a2, 0x8017 -/* B680EC 800F0F4C 8CC61CB0 */ lw $a2, %lo(D_80171CB0)($a2) +/* B680E8 800F0F48 3C068017 */ lui $a2, %hi(gAudioContext+0x2b30) # $a2, 0x8017 +/* B680EC 800F0F4C 8CC61CB0 */ lw $a2, %lo(gAudioContext+0x2b30)($a2) /* B680F0 800F0F50 24A5A1C4 */ addiu $a1, %lo(D_8014A1C4) # addiu $a1, $a1, -0x5e3c /* B680F4 800F0F54 8FA400B0 */ lw $a0, 0xb0($sp) /* B680F8 800F0F58 AFAB0010 */ sw $t3, 0x10($sp) /* B680FC 800F0F5C 0C03EF2D */ jal GfxPrint_Printf /* B68100 800F0F60 032A3823 */ subu $a3, $t9, $t2 -/* B68104 800F0F64 3C0E8017 */ lui $t6, %hi(D_80171CB0) # $t6, 0x8017 -/* B68108 800F0F68 8DCE1CB0 */ lw $t6, %lo(D_80171CB0)($t6) +/* B68104 800F0F64 3C0E8017 */ lui $t6, %hi(gAudioContext+0x2b30) # $t6, 0x8017 +/* B68108 800F0F68 8DCE1CB0 */ lw $t6, %lo(gAudioContext+0x2b30)($t6) /* B6810C 800F0F6C 3C108015 */ lui $s0, %hi(D_8014A1E4) # $s0, 0x8015 /* B68110 800F0F70 2610A1E4 */ addiu $s0, %lo(D_8014A1E4) # addiu $s0, $s0, -0x5e1c /* B68114 800F0F74 11C00016 */ beqz $t6, .L800F0FD0 @@ -3007,15 +3007,15 @@ glabel L800F0CFC /* B68128 800F0F88 0C03ED07 */ jal GfxPrint_SetPos /* B6812C 800F0F8C 2406000B */ li $a2, 11 /* B68130 800F0F90 02510019 */ multu $s2, $s1 -/* B68134 800F0F94 3C068017 */ lui $a2, %hi(D_80171CCE) +/* B68134 800F0F94 3C068017 */ lui $a2, %hi(gAudioContext+0x2b4e) /* B68138 800F0F98 8FA400B0 */ lw $a0, 0xb0($sp) /* B6813C 800F0F9C 02002825 */ move $a1, $s0 /* B68140 800F0FA0 00006012 */ mflo $t4 /* B68144 800F0FA4 00CC3021 */ addu $a2, $a2, $t4 /* B68148 800F0FA8 0C03EF2D */ jal GfxPrint_Printf -/* B6814C 800F0FAC 84C61CCE */ lh $a2, %lo(D_80171CCE)($a2) -/* B68150 800F0FB0 3C0D8017 */ lui $t5, %hi(D_80171CB0) # $t5, 0x8017 -/* B68154 800F0FB4 8DAD1CB0 */ lw $t5, %lo(D_80171CB0)($t5) +/* B6814C 800F0FAC 84C61CCE */ lh $a2, %lo(gAudioContext+0x2b4e)($a2) +/* B68150 800F0FB0 3C0D8017 */ lui $t5, %hi(gAudioContext+0x2b30) # $t5, 0x8017 +/* B68154 800F0FB4 8DAD1CB0 */ lw $t5, %lo(gAudioContext+0x2b30)($t5) /* B68158 800F0FB8 26520001 */ addiu $s2, $s2, 1 /* B6815C 800F0FBC 00129600 */ sll $s2, $s2, 0x18 /* B68160 800F0FC0 00129603 */ sra $s2, $s2, 0x18 @@ -3027,13 +3027,13 @@ glabel L800F0CFC /* B68174 800F0FD4 24050003 */ li $a1, 3 /* B68178 800F0FD8 0C03ED07 */ jal GfxPrint_SetPos /* B6817C 800F0FDC 2406000C */ li $a2, 12 -/* B68180 800F0FE0 3C188017 */ lui $t8, %hi(D_80171ED4) # $t8, 0x8017 -/* B68184 800F0FE4 3C0F8017 */ lui $t7, %hi(D_80171ED0) # $t7, 0x8017 -/* B68188 800F0FE8 8DEF1ED0 */ lw $t7, %lo(D_80171ED0)($t7) -/* B6818C 800F0FEC 8F181ED4 */ lw $t8, %lo(D_80171ED4)($t8) +/* B68180 800F0FE0 3C188017 */ lui $t8, %hi(gAudioContext+0x2d54) # $t8, 0x8017 +/* B68184 800F0FE4 3C0F8017 */ lui $t7, %hi(gAudioContext+0x2d50) # $t7, 0x8017 +/* B68188 800F0FE8 8DEF1ED0 */ lw $t7, %lo(gAudioContext+0x2d50)($t7) +/* B6818C 800F0FEC 8F181ED4 */ lw $t8, %lo(gAudioContext+0x2d54)($t8) /* B68190 800F0FF0 3C058015 */ lui $a1, %hi(D_8014A1EC) # $a1, 0x8015 -/* B68194 800F0FF4 3C078017 */ lui $a3, %hi(D_80171ED8) # $a3, 0x8017 -/* B68198 800F0FF8 8CE71ED8 */ lw $a3, %lo(D_80171ED8)($a3) +/* B68194 800F0FF4 3C078017 */ lui $a3, %hi(gAudioContext+0x2d58) # $a3, 0x8017 +/* B68198 800F0FF8 8CE71ED8 */ lw $a3, %lo(gAudioContext+0x2d58)($a3) /* B6819C 800F0FFC 24A5A1EC */ addiu $a1, %lo(D_8014A1EC) # addiu $a1, $a1, -0x5e14 /* B681A0 800F1000 8FA400B0 */ lw $a0, 0xb0($sp) /* B681A4 800F1004 0C03EF2D */ jal GfxPrint_Printf @@ -3148,8 +3148,8 @@ glabel L800F1014 /* B68354 800F11B4 24050003 */ li $a1, 3 /* B68358 800F11B8 0C03ED07 */ jal GfxPrint_SetPos /* B6835C 800F11BC 24060007 */ li $a2, 7 -/* B68360 800F11C0 3C028017 */ lui $v0, %hi(D_8017280A) # $v0, 0x8017 -/* B68364 800F11C4 9042280A */ lbu $v0, %lo(D_8017280A)($v0) +/* B68360 800F11C0 3C028017 */ lui $v0, %hi(gAudioContext+0x368a) # $v0, 0x8017 +/* B68364 800F11C4 9042280A */ lbu $v0, %lo(gAudioContext+0x368a)($v0) /* B68368 800F11C8 3C058015 */ lui $a1, %hi(D_8014A228) # $a1, 0x8015 /* B6836C 800F11CC 24A5A228 */ addiu $a1, %lo(D_8014A228) # addiu $a1, $a1, -0x5dd8 /* B68370 800F11D0 00025040 */ sll $t2, $v0, 1 @@ -3161,8 +3161,8 @@ glabel L800F1014 /* B68388 800F11E8 24050003 */ li $a1, 3 /* B6838C 800F11EC 0C03ED07 */ jal GfxPrint_SetPos /* B68390 800F11F0 24060008 */ li $a2, 8 -/* B68394 800F11F4 3C028017 */ lui $v0, %hi(D_8017280C) # $v0, 0x8017 -/* B68398 800F11F8 9042280C */ lbu $v0, %lo(D_8017280C)($v0) +/* B68394 800F11F4 3C028017 */ lui $v0, %hi(gAudioContext+0x368c) # $v0, 0x8017 +/* B68398 800F11F8 9042280C */ lbu $v0, %lo(gAudioContext+0x368c)($v0) /* B6839C 800F11FC 3C058015 */ lui $a1, %hi(D_8014A23C) # $a1, 0x8015 /* B683A0 800F1200 24A5A23C */ addiu $a1, %lo(D_8014A23C) # addiu $a1, $a1, -0x5dc4 /* B683A4 800F1204 00025840 */ sll $t3, $v0, 1 @@ -3174,8 +3174,8 @@ glabel L800F1014 /* B683BC 800F121C 24050003 */ li $a1, 3 /* B683C0 800F1220 0C03ED07 */ jal GfxPrint_SetPos /* B683C4 800F1224 24060009 */ li $a2, 9 -/* B683C8 800F1228 3C068017 */ lui $a2, %hi(D_8017280D) # $a2, 0x8017 -/* B683CC 800F122C 80C6280D */ lb $a2, %lo(D_8017280D)($a2) +/* B683C8 800F1228 3C068017 */ lui $a2, %hi(gAudioContext+0x368d) # $a2, 0x8017 +/* B683CC 800F122C 80C6280D */ lb $a2, %lo(gAudioContext+0x368d)($a2) /* B683D0 800F1230 3C058015 */ lui $a1, %hi(D_8014A250) # $a1, 0x8015 /* B683D4 800F1234 24A5A250 */ addiu $a1, %lo(D_8014A250) # addiu $a1, $a1, -0x5db0 /* B683D8 800F1238 24C60001 */ addiu $a2, $a2, 1 diff --git a/asm/non_matchings/code/code_800EC960/func_800F3054.s b/asm/non_matchings/code/code_800EC960/func_800F3054.s index 9002f9ea3c..db22132cbb 100644 --- a/asm/non_matchings/code/code_800EC960/func_800F3054.s +++ b/asm/non_matchings/code/code_800EC960/func_800F3054.s @@ -4,8 +4,8 @@ glabel func_800F3054 /* B6A1FC 800F305C 0C03EB4D */ jal func_800FAD34 /* B6A200 800F3060 00000000 */ nop /* B6A204 800F3064 14400030 */ bnez $v0, .L800F3128 -/* B6A208 800F3068 3C0E8017 */ lui $t6, %hi(D_80171A1C) # $t6, 0x8017 -/* B6A20C 800F306C 8DCE1A1C */ lw $t6, %lo(D_80171A1C)($t6) +/* 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) @@ -46,8 +46,8 @@ glabel func_800F3054 /* B6A2A0 800F3100 00000000 */ nop /* B6A2A4 800F3104 0C0396E0 */ jal func_800E5B80 /* B6A2A8 800F3108 00000000 */ nop -/* B6A2AC 800F310C 3C198017 */ lui $t9, %hi(D_80171A1C) # $t9, 0x8017 -/* B6A2B0 800F3110 8F391A1C */ lw $t9, %lo(D_80171A1C)($t9) +/* 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) diff --git a/asm/non_matchings/code/code_800EC960/func_800F32F0.s b/asm/non_matchings/code/code_800EC960/func_800F32F0.s index aca7b31f6f..fe788a4b0b 100644 --- a/asm/non_matchings/code/code_800EC960/func_800F32F0.s +++ b/asm/non_matchings/code/code_800EC960/func_800F32F0.s @@ -63,11 +63,11 @@ glabel func_800F32F0 /* B6A56C 800F33CC 00021603 */ sra $v0, $v0, 0x18 .L800F33D0: /* B6A570 800F33D0 00066080 */ sll $t4, $a2, 2 -/* B6A574 800F33D4 3C058017 */ lui $a1, %hi(D_801729A8) +/* B6A574 800F33D4 3C058017 */ lui $a1, %hi(gAudioContext+0x3828) /* B6A578 800F33D8 00AC2821 */ addu $a1, $a1, $t4 -/* B6A57C 800F33DC 8CA529A8 */ lw $a1, %lo(D_801729A8)($a1) -/* B6A580 800F33E0 3C0D8017 */ lui $t5, %hi(D_80174C30) # $t5, 0x8017 -/* B6A584 800F33E4 25AD4C30 */ addiu $t5, %lo(D_80174C30) # addiu $t5, $t5, 0x4c30 +/* 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) diff --git a/asm/non_matchings/code/code_800EC960/func_800F35EC.s b/asm/non_matchings/code/code_800EC960/func_800F35EC.s index 3afe85e4d2..967763a3b0 100644 --- a/asm/non_matchings/code/code_800EC960/func_800F35EC.s +++ b/asm/non_matchings/code/code_800EC960/func_800F35EC.s @@ -41,8 +41,8 @@ glabel func_800F35EC /* 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(D_80171AFC) -/* B6A7DC 800F363C 8D081AFC */ lw $t0, %lo(D_80171AFC)($t0) +/* 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 @@ -87,8 +87,8 @@ glabel L800F36C0 /* 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(D_80171AFC) -/* B6A878 800F36D8 8DCE1AFC */ lw $t6, %lo(D_80171AFC)($t6) +/* 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 diff --git a/asm/non_matchings/code/code_800EC960/func_800F4010.s b/asm/non_matchings/code/code_800EC960/func_800F4010.s index 73068b4952..51d4ccf252 100644 --- a/asm/non_matchings/code/code_800EC960/func_800F4010.s +++ b/asm/non_matchings/code/code_800EC960/func_800F4010.s @@ -49,8 +49,8 @@ glabel func_800F4010 /* B6B230 800F4090 10000007 */ b .L800F40B0 /* B6B234 800F4094 24020001 */ li $v0, 1 .L800F4098: -/* B6B238 800F4098 3C028017 */ lui $v0, %hi(D_80171AFC) # $v0, 0x8017 -/* B6B23C 800F409C 8C421AFC */ lw $v0, %lo(D_80171AFC)($v0) +/* 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 diff --git a/asm/non_matchings/code/code_800EC960/func_800F491C.s b/asm/non_matchings/code/code_800EC960/func_800F491C.s index 81be1cd892..cf1ced74cb 100644 --- a/asm/non_matchings/code/code_800EC960/func_800F491C.s +++ b/asm/non_matchings/code/code_800EC960/func_800F491C.s @@ -34,8 +34,8 @@ glabel func_800F491C /* 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(D_80174C30) # $s1, 0x8017 -/* B6BB44 800F49A4 26314C30 */ addiu $s1, %lo(D_80174C30) # addiu $s1, $s1, 0x4c30 +/* 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 diff --git a/asm/non_matchings/code/code_800EC960/func_800F4B58.s b/asm/non_matchings/code/code_800EC960/func_800F4B58.s index 8060ff32f0..2de9cf604a 100644 --- a/asm/non_matchings/code/code_800EC960/func_800F4B58.s +++ b/asm/non_matchings/code/code_800EC960/func_800F4B58.s @@ -9,7 +9,7 @@ glabel func_800F4B58 /* 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(D_8012F8B4) # $t2, 0x8013 +/* 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 @@ -17,7 +17,7 @@ glabel func_800F4B58 /* 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(D_8012F8B4) # addiu $t2, $t2, -0x74c +/* 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) diff --git a/asm/non_matchings/code/code_800EC960/func_800F4BF4.s b/asm/non_matchings/code/code_800EC960/func_800F4BF4.s index 376e541b7a..0732fa7d06 100644 --- a/asm/non_matchings/code/code_800EC960/func_800F4BF4.s +++ b/asm/non_matchings/code/code_800EC960/func_800F4BF4.s @@ -3,7 +3,7 @@ glabel func_800F4BF4 /* 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(D_8012F8B4) # $t9, 0x8013 +/* 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 @@ -13,7 +13,7 @@ glabel func_800F4BF4 /* 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(D_8012F8B4) # addiu $t9, $t9, -0x74c +/* 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) diff --git a/asm/non_matchings/code/code_800EC960/func_800F56A8.s b/asm/non_matchings/code/code_800EC960/func_800F56A8.s index bfae52bfbc..cf1b383556 100644 --- a/asm/non_matchings/code/code_800EC960/func_800F56A8.s +++ b/asm/non_matchings/code/code_800EC960/func_800F56A8.s @@ -16,10 +16,10 @@ glabel func_800F56A8 /* 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(D_8017280B) # $t1, 0x8017 +/* 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(D_8017280B)($t1) +/* 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) diff --git a/asm/non_matchings/code/code_800F7260/func_800F8480.s b/asm/non_matchings/code/code_800F7260/func_800F8480.s index 23d651f4ce..bb0744c39f 100644 --- a/asm/non_matchings/code/code_800F7260/func_800F8480.s +++ b/asm/non_matchings/code/code_800F7260/func_800F8480.s @@ -50,12 +50,12 @@ glabel func_800F8480 /* B6F6DC 800F853C 000F7900 */ sll $t7, $t7, 4 /* B6F6E0 800F8540 01CF8021 */ addu $s0, $t6, $t7 /* B6F6E4 800F8544 9202002A */ lbu $v0, 0x2a($s0) -/* B6F6E8 800F8548 3C048017 */ lui $a0, %hi(D_801729A8) +/* B6F6E8 800F8548 3C048017 */ lui $a0, %hi(gAudioContext+0x3828) /* B6F6EC 800F854C 0006C080 */ sll $t8, $a2, 2 /* B6F6F0 800F8550 00982021 */ addu $a0, $a0, $t8 /* B6F6F4 800F8554 24010002 */ li $at, 2 /* B6F6F8 800F8558 14410053 */ bne $v0, $at, .L800F86A8 -/* B6F6FC 800F855C 8C8429A8 */ lw $a0, %lo(D_801729A8)($a0) +/* B6F6FC 800F855C 8C8429A8 */ lw $a0, %lo(gAudioContext+0x3828)($a0) /* B6F700 800F8560 96020026 */ lhu $v0, 0x26($s0) /* B6F704 800F8564 3C198013 */ lui $t9, %hi(D_80130570) # $t9, 0x8013 /* B6F708 800F8568 27390570 */ addiu $t9, %lo(D_80130570) # addiu $t9, $t9, 0x570 diff --git a/asm/non_matchings/code/code_800F7260/func_800F8F88.s b/asm/non_matchings/code/code_800F7260/func_800F8F88.s index 339e8330e8..5fa6f113b7 100644 --- a/asm/non_matchings/code/code_800F7260/func_800F8F88.s +++ b/asm/non_matchings/code/code_800F7260/func_800F8F88.s @@ -1,9 +1,9 @@ glabel func_800F8F88 -/* B70128 800F8F88 3C0F8017 */ lui $t7, %hi(D_801729A8) # $t7, 0x8017 -/* B7012C 800F8F8C 8DEF29A8 */ lw $t7, %lo(D_801729A8)($t7) -/* B70130 800F8F90 3C0E8017 */ lui $t6, %hi(D_80174C30) # $t6, 0x8017 +/* B70128 800F8F88 3C0F8017 */ lui $t7, %hi(gAudioContext+0x3828) # $t7, 0x8017 +/* B7012C 800F8F8C 8DEF29A8 */ lw $t7, %lo(gAudioContext+0x3828)($t7) +/* B70130 800F8F90 3C0E8017 */ lui $t6, %hi(gAudioContext+0x5AB0) # $t6, 0x8017 /* B70134 800F8F94 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* B70138 800F8F98 25CE4C30 */ addiu $t6, %lo(D_80174C30) # addiu $t6, $t6, 0x4c30 +/* B70138 800F8F98 25CE4C30 */ addiu $t6, %lo(gAudioContext+0x5AB0) # addiu $t6, $t6, 0x4c30 /* B7013C 800F8F9C AFBF001C */ sw $ra, 0x1c($sp) /* B70140 800F8FA0 11CF000F */ beq $t6, $t7, .L800F8FE0 /* B70144 800F8FA4 AFB00018 */ sw $s0, 0x18($sp) diff --git a/asm/non_matchings/code/code_800F9280/func_800F9280.s b/asm/non_matchings/code/code_800F9280/func_800F9280.s index fa93399c79..6968a30567 100644 --- a/asm/non_matchings/code/code_800F9280/func_800F9280.s +++ b/asm/non_matchings/code/code_800F9280/func_800F9280.s @@ -20,8 +20,8 @@ glabel func_800F9280 /* B70464 800F92C4 14C10019 */ bne $a2, $at, .L800F932C /* B70468 800F92C8 00C03825 */ move $a3, $a2 /* B7046C 800F92CC 97AF0046 */ lhu $t7, 0x46($sp) -/* B70470 800F92D0 3C088017 */ lui $t0, %hi(D_801719D4) # $t0, 0x8017 -/* B70474 800F92D4 850819D4 */ lh $t0, %lo(D_801719D4)($t0) +/* B70470 800F92D0 3C088017 */ lui $t0, %hi(gAudioContext+0x2854) # $t0, 0x8017 +/* B70474 800F92D4 850819D4 */ lh $t0, %lo(gAudioContext+0x2854)($t0) /* B70478 800F92D8 000FC0C3 */ sra $t8, $t7, 3 /* B7047C 800F92DC 0018C900 */ sll $t9, $t8, 4 /* B70480 800F92E0 0338C823 */ subu $t9, $t9, $t8 @@ -44,8 +44,8 @@ glabel func_800F9280 /* B704C4 800F9324 10000018 */ b .L800F9388 /* B704C8 800F9328 8FA7002C */ lw $a3, 0x2c($sp) .L800F932C: -/* B704CC 800F932C 3C088017 */ lui $t0, %hi(D_801719D4) # $t0, 0x8017 -/* B704D0 800F9330 950819D4 */ lhu $t0, %lo(D_801719D4)($t0) +/* B704CC 800F932C 3C088017 */ lui $t0, %hi(gAudioContext+0x2854) # $t0, 0x8017 +/* B704D0 800F9330 950819D4 */ lhu $t0, %lo(gAudioContext+0x2854)($t0) /* B704D4 800F9334 97B90046 */ lhu $t9, 0x46($sp) /* B704D8 800F9338 320300FF */ andi $v1, $s0, 0xff /* B704DC 800F933C 93AE003F */ lbu $t6, 0x3f($sp) diff --git a/asm/non_matchings/code/code_800F9280/func_800F9474.s b/asm/non_matchings/code/code_800F9280/func_800F9474.s index 523bdc0811..6edbb77c23 100644 --- a/asm/non_matchings/code/code_800F9280/func_800F9474.s +++ b/asm/non_matchings/code/code_800F9280/func_800F9474.s @@ -1,6 +1,6 @@ glabel func_800F9474 -/* B70614 800F9474 3C0E8017 */ lui $t6, %hi(D_801719D4) # $t6, 0x8017 -/* B70618 800F9478 95CE19D4 */ lhu $t6, %lo(D_801719D4)($t6) +/* 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 diff --git a/asm/non_matchings/code/code_800F9280/func_800FA0B4.s b/asm/non_matchings/code/code_800F9280/func_800FA0B4.s index cd0e5fcf87..292e89d484 100644 --- a/asm/non_matchings/code/code_800F9280/func_800FA0B4.s +++ b/asm/non_matchings/code/code_800F9280/func_800FA0B4.s @@ -6,9 +6,9 @@ glabel func_800FA0B4 /* 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(D_801726B0) +/* B71270 800FA0D0 3C0F8017 */ lui $t7, %hi(gAudioContext+0x3530) /* B71274 800FA0D4 01EE7821 */ addu $t7, $t7, $t6 -/* B71278 800FA0D8 8DEF26B0 */ lw $t7, %lo(D_801726B0)($t7) +/* 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 diff --git a/asm/non_matchings/code/code_800F9280/func_800FA3DC.s b/asm/non_matchings/code/code_800F9280/func_800FA3DC.s index ebd34826b2..fc3a5904ed 100644 --- a/asm/non_matchings/code/code_800F9280/func_800FA3DC.s +++ b/asm/non_matchings/code/code_800F9280/func_800FA3DC.s @@ -453,9 +453,9 @@ glabel func_800FA3DC .L800FAA38: /* B71BD8 800FAA38 01F57823 */ subu $t7, $t7, $s5 /* B71BDC 800FAA3C 000F7940 */ sll $t7, $t7, 5 -/* B71BE0 800FAA40 3C0E8017 */ lui $t6, %hi(D_801726B0) +/* B71BE0 800FAA40 3C0E8017 */ lui $t6, %hi(gAudioContext+0x3530) /* B71BE4 800FAA44 01CF7021 */ addu $t6, $t6, $t7 -/* B71BE8 800FAA48 8DCE26B0 */ lw $t6, %lo(D_801726B0)($t6) +/* B71BE8 800FAA48 8DCE26B0 */ lw $t6, %lo(gAudioContext+0x3530)($t6) /* B71BEC 800FAA4C 000ECFC2 */ srl $t9, $t6, 0x1f /* B71BF0 800FAA50 572000A7 */ bnezl $t9, .L800FACF0 /* B71BF4 800FAA54 26B50001 */ addiu $s5, $s5, 1 diff --git a/data/code_800DACC0.bss.s b/data/code_800DACC0.bss.s index da5a7979b9..75ed35dba6 100644 --- a/data/code_800DACC0.bss.s +++ b/data/code_800DACC0.bss.s @@ -262,376 +262,7 @@ glabel D_8016EE8B .space 0x2F5 glabel gAudioContext - .space 0x1 - -glabel D_8016F181 - .space 0x5 - -glabel D_8016F186 - .space 0x2 - -glabel D_8016F188 - .space 0x4 - -glabel D_8016F18C - .space 0x4 - -glabel D_8016F190 - .space 0x8 - -glabel D_8016F198 - .space 0x18 - -glabel D_8016F1B0 - .space 0x50 - -glabel D_8016F200 - .space 0x48 - -glabel D_8016F248 - .space 0x38 - -glabel D_8016F280 - .space 0x1A0 - -glabel D_8016F420 - .space 0x10 - -glabel D_8016F430 - .space 0x2D0 - -glabel D_8016F700 - .space 0x5A0 - -glabel D_8016FCA0 - .space 0xC4C - -glabel D_801708EC - .space 0x584 - -glabel D_80170E70 - .space 0x58 - -glabel D_80170EC8 - .space 0xD8 - -glabel D_80170FA0 - .space 0x18 - -glabel D_80170FB8 - .space 0x40 - -glabel D_80170FF8 - .space 0x18 - -glabel D_80171010 - .space 0x40 - -glabel D_80171050 - .space 0x18 - -glabel D_80171068 - .space 0x118 - -glabel D_80171180 - .space 0x5E8 - -glabel D_80171768 - .space 0x18 - -glabel D_80171780 - .space 0x4 - -glabel D_80171784 - .space 0x22C - -glabel D_801719B0 - .space 0x4 - -glabel D_801719B4 - .space 0x4 - -glabel D_801719B8 - .space 0x4 - -glabel D_801719BC - .space 0x4 - -glabel D_801719C0 - .space 0x4 - -glabel D_801719C4 - .space 0x4 - -glabel D_801719C8 - .space 0xC - -glabel D_801719D4 - .space 0x8 - -glabel D_801719DC - .space 0x8 - -glabel D_801719E4 - .space 0x4 - -glabel D_801719E8 - .space 0x4 - -glabel D_801719EC - .space 0x28 - -glabel D_80171A14 - .space 0x4 - -glabel D_80171A18 - .space 0x2 - -glabel gSoundMode - .space 0x2 - -glabel D_80171A1C - .space 0xE0 - -glabel D_80171AFC - .space 0x14 - -glabel D_80171B10 - .space 0x10 - -glabel D_80171B20 - .space 0x10 - -glabel D_80171B30 - .space 0x10 - -glabel D_80171B40 - .space 0x4 - -glabel D_80171B44 - .space 0x4 - -glabel D_80171B48 - .space 0x28 - -glabel D_80171B70 - .space 0x10 - -glabel D_80171B80 - .space 0x10 - -glabel D_80171B90 - .space 0x10 - -glabel D_80171BA0 - .space 0x4 - -glabel D_80171BA4 - .space 0x4 - -glabel D_80171BA8 - .space 0x4 - -glabel D_80171BAC - .space 0x12 - -glabel D_80171BBE - .space 0xB6 - -glabel D_80171C74 - .space 0x4 - -glabel D_80171C78 - .space 0x8 - -glabel D_80171C80 - .space 0xC - -glabel D_80171C8C - .space 0x7 - -glabel D_80171C93 - .space 0x5 - -glabel D_80171C98 - .space 0x7 - -glabel D_80171C9F - .space 0x11 - -glabel D_80171CB0 - .space 0x4 - -glabel D_80171CB4 - .space 0x4 - -glabel D_80171CB8 - .space 0x4 - -glabel D_80171CBC - .space 0x12 - -glabel D_80171CCE - .space 0xB6 - -glabel D_80171D84 - .space 0x4 - -glabel D_80171D88 - .space 0x8 - -glabel D_80171D90 - .space 0xC - -glabel D_80171D9C - .space 0x6 - -glabel D_80171DA2 - .space 0x1 - -glabel D_80171DA3 - .space 0x5 - -glabel D_80171DA8 - .space 0x6 - -glabel D_80171DAE - .space 0x1 - -glabel D_80171DAF - .space 0x11 - -glabel D_80171DC0 - .space 0x4 - -glabel D_80171DC4 - .space 0xD0 - -glabel D_80171E94 - .space 0x4 - -glabel D_80171E98 - .space 0x1A - -glabel D_80171EB2 - .space 0xC - -glabel D_80171EBE - .space 0x12 - -glabel D_80171ED0 - .space 0x4 - -glabel D_80171ED4 - .space 0x4 - -glabel D_80171ED8 - .space 0x4 - -glabel D_80171EDC - .space 0x184 - -glabel D_80172060 - .space 0x8 - -glabel D_80172068 - .space 0x8 - -glabel D_80172070 - .space 0x280 - -glabel D_801722F0 - .space 0x4 - -glabel D_801722F4 - .space 0x4 - -glabel D_801722F8 - .space 0xC - -glabel D_80172304 - .space 0x280 - -glabel D_80172584 - .space 0x4 - -glabel D_80172588 - .space 0xC - -glabel D_80172594 - .space 0x4 - -glabel D_80172598 - .space 0x8 - -glabel D_801725A0 - .space 0xC - -glabel D_801725AC - .space 0xC - -glabel D_801725B8 - .space 0x30 - -glabel D_801725E8 - .space 0x30 - -glabel D_80172618 - .space 0x81 - -glabel D_80172699 - .space 0x7 - -glabel D_801726A0 - .space 0x4 - -glabel D_801726A4 - .space 0x8 - -glabel D_801726AC - .space 0x4 - -glabel D_801726B0 - .space 0x38 - -glabel D_801726E8 - .space 0x120 - -glabel D_80172808 - .space 0x2 - -glabel D_8017280A - .space 0x1 - -glabel D_8017280B - .space 0x1 - -glabel D_8017280C - .space 0x1 - -glabel D_8017280D - .space 0x87 - -glabel D_80172894 - .space 0x114 - -glabel D_801729A8 - .space 0x288 - -glabel D_80172C30 - .space 0x70 - -glabel D_80172CA0 - .space 0x1F90 - -glabel D_80174C30 - .space 0x70 - -glabel D_80174CA0 - .space 0x68 - -glabel D_80174D08 - .space 0x10 + .space 0x5b98 glabel gNoteFreeLists .space 0x10 diff --git a/data/code_800DACC0.data.s b/data/code_800DACC0.data.s index 09b265a8ba..22bae93b12 100644 --- a/data/code_800DACC0.data.s +++ b/data/code_800DACC0.data.s @@ -53,16 +53,16 @@ glabel D_8012F4B4 glabel D_8012F6B4 .incbin "baserom.z64", 0xBA6854, 0x200 -glabel D_8012F8B4 +glabel gNoteFrequencies .incbin "baserom.z64", 0xBA6A54, 0x200 -glabel D_8012FAB4 +glabel gDefaultShortNoteVelocityTable .incbin "baserom.z64", 0xBA6C54, 0x10 -glabel D_8012FAC4 +glabel gDefaultShortNoteDurationTable .incbin "baserom.z64", 0xBA6C64, 0x10 -glabel D_8012FAD4 +glabel gDefaultEnvelope .incbin "baserom.z64", 0xBA6C74, 0x10 glabel gZeroNoteSub diff --git a/include/functions.h b/include/functions.h index f231f04cc0..b78584d8f1 100644 --- a/include/functions.h +++ b/include/functions.h @@ -1925,20 +1925,20 @@ void FaultDrawer_SetDefault(); // ? func_800DE238(?); // ? func_800DE258(?); // ? func_800DE2B0(?); -void* Audio_SoundAlloc(SoundAllocPool* pool, u32 size); +void* Audio_AllocDmaMemory(SoundAllocPool* pool, u32 size); // ? func_800DE344(?); -// ? func_800DE380(?); -// ? func_800DE3DC(?); -// ? func_800DE434(?); -// ? func_800DE45C(?); -// ? func_800DE470(?); -// ? func_800DE4B0(?); -// ? func_800DE5F0(?); -// ? func_800DE650(?); -// ? func_800DE6D4(?); -// ? func_800DE758(?); -// ? func_800DE81C(?); -// ? func_800DE8E0(?); +void* Audio_AllocZeroed(SoundAllocPool* pool, u32 size); +void* Audio_Alloc(SoundAllocPool* pool, u32 size); +void Audio_SoundAllocPoolInit(SoundAllocPool* pool, void* memAddr, u32 size); +void Audio_PersistentPoolClear(PersistentPool* persistent); +void Audio_TemporaryPoolClear(TemporaryPool* temporary); +void func_800DE4B0(SoundAllocPool* pool); +void Audio_InitMainPools(s32 sizeForAudioInitPool); +// void Audio_SessionPoolsInit(?); +// void Audio_SeqAndBankPoolInit(?); +// void Audio_PersistentPoolsInit(?); +// void Audio_TemporaryPoolsInit(?); +// void* Audio_AllocBankOrSeq(?); // ? func_800DF074(?); // ? func_800DF0CC(?); // ? func_800DF5DC(?); @@ -1968,10 +1968,10 @@ void* Audio_SoundAlloc(SoundAllocPool* pool, u32 size); // ? func_800E11F0(?); // ? func_800E12DC(?); // ? func_800E1618(?); -s32 func_800E18B0(s32); -// ? func_800E1928(?); -// ? func_800E1A18(?); -// ? func_800E1A48(?); +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(?); @@ -2104,42 +2104,16 @@ void Audio_NoteVibratoInit(Note* note); void Audio_NotePortamentoInit(Note* note); void Audio_AdsrInit(AdsrState* adsr, AdsrEnvelope* envelope, s16* volOut); f32 Audio_AdsrUpdate(AdsrState* adsr); -// ? func_800E9340(?); -// ? func_800E93A8(?); -// ? func_800E9584(?); -// ? func_800E96D8(?); -// ? func_800E97FC(?); -// ? func_800E9878(?); void Audio_SequenceChannelDisable(SequenceChannel* seqChannel); -// ? func_800E9934(?); -// ? func_800E9A2C(?); -// ? func_800E9AAC(?); -// ? func_800E9B44(?); +void Audio_SequencePlayerDisableAsFinished(SequencePlayer* seqPlayer); void Audio_SequencePlayerDisable(SequencePlayer* seqPlayer); void Audio_AudioListPushBack(AudioListItem* list, AudioListItem* item); void* Audio_AudioListPopBack(AudioListItem* list); -// ? func_800E9CA8(?); -// ? func_800E9D48(?); -// ? func_800E9D5C(?); -// ? func_800E9D94(?); -// ? func_800E9DD4(?); -// ? func_800E9ED8(?); -// ? func_800E9F64(?); -// ? func_800EA0C0(?); -// ? func_800EA440(?); -// ? func_800EAAE0(?); -// ? func_800EAEF4(?); -// ? func_800EAF24(?); -// ? func_800EAF98(?); -// ? func_800EB044(?); -// ? func_800EB068(?); -// ? func_800EBD58(?); -// ? func_800EC564(?); -// ? func_800EC618(?); -// ? func_800EC668(?); -// ? func_800EC734(?); -// ? func_800EC80C(?); -// ? func_800EC8DC(?); +void Audio_ProcessSequences(s32 arg0); +void Audio_ProcessSequence(SequencePlayer* seqPlayer); +void Audio_ResetSequencePlayer(SequencePlayer* seqPlayer); +void func_800EC734(s32 seqPlayerIdx); +void Audio_InitSequencePlayers(void); // ? func_800ECA00(?); // ? func_800ECA60(?); // ? func_800ECAF0(?); diff --git a/include/variables.h b/include/variables.h index 8105715b52..326e167b13 100644 --- a/include/variables.h +++ b/include/variables.h @@ -621,10 +621,11 @@ extern s16* gWaveSamples[6]; extern f32 gPitchBendFrequencyScale[256]; //extern ? D_8012F098; //extern ? D_8012F0B0; -//extern ? D_8012F8B4; -//extern ? D_8012FAB4; -//extern ? D_8012FAC4; -//extern ? D_8012FAD4; +extern f32 D_8012F4B4[256]; +extern f32 gNoteFrequencies[]; +extern u8 gDefaultShortNoteVelocityTable[16]; +extern u8 gDefaultShortNoteDurationTable[16]; +extern AdsrEnvelope gDefaultEnvelope[3]; extern NoteSubEu gZeroNoteSub; extern NoteSubEu gDefaultNoteSub; extern u16 gHeadsetPanQuantization[0x10]; @@ -3595,123 +3596,8 @@ extern FaultThreadStruct gFaultStruct; //extern ? D_8016E750; //extern ? D_8016E9A4; //extern ? D_8016EE8B; -extern AudioContext gAudioContext; -//extern ? D_8016F181; -//extern ? D_8016F186; -//extern ? D_8016F188; -//extern ? D_8016F18C; -//extern ? D_8016F190; -//extern ? D_8016F198; -//extern ? D_8016F1B0; -//extern ? D_8016F200; -//extern ? D_8016F248; -//extern ? D_8016F280; -//extern ? D_8016F420; -//extern ? D_8016F430; -//extern ? D_8016F700; -//extern ? D_8016FCA0; -//extern ? D_80170001; -//extern ? D_801708EC; -//extern ? D_80170E70; -//extern ? D_80170EC8; -//extern ? D_80170FA0; -//extern ? D_80170FB8; -//extern ? D_80170FF8; -//extern ? D_80171010; -//extern ? D_80171050; -//extern ? D_80171068; -//extern ? D_80171180; -//extern ? D_80171768; -//extern ? D_80171780; -//extern ? D_80171784; -//extern ? D_801719B8; -//extern ? D_801719BC; -//extern ? D_801719C0; -//extern ? D_801719C4; -//extern ? D_801719C8; -//extern ? D_801719D4; -//extern ? D_801719DC; -extern f32 D_801719EC; -//extern ? D_80171A14; -//extern ? D_80171A18; -extern s8 gSoundMode; -//extern ? D_80171A1C; -//extern ? D_80171AFC; -//extern ? D_80171B10; -//extern ? D_80171B20; -//extern ? D_80171B30; -//extern ? D_80171B40; -//extern ? D_80171B44; -//extern ? D_80171B48; -//extern ? D_80171B70; -//extern ? D_80171B80; -//extern ? D_80171B90; -//extern ? D_80171BA0; -//extern ? D_80171BA4; -//extern ? D_80171BA8; -//extern ? D_80171BAC; -//extern ? D_80171C74; -//extern ? D_80171C78; -//extern ? D_80171C80; -//extern ? D_80171C8C; -//extern ? D_80171C93; -//extern ? D_80171C98; -//extern ? D_80171C9F; -//extern ? D_80171CB0; -//extern ? D_80171CB4; -//extern ? D_80171CB8; -//extern ? D_80171CBC; -//extern ? D_80171D84; -//extern ? D_80171D88; -//extern ? D_80171D90; -//extern ? D_80171D9C; -//extern ? D_80171DA2; -//extern ? D_80171DA3; -//extern ? D_80171DA8; -//extern ? D_80171DAE; -//extern ? D_80171DAF; -//extern ? D_80171DC0; -//extern ? D_80171DC4; -//extern ? D_80171E94; -//extern ? D_80171E98; -//extern ? D_80171EB2; -//extern ? D_80171EBE; -//extern ? D_80171ED0; -//extern ? D_80171ED4; -//extern ? D_80171ED8; -//extern ? D_80171EDC; -//extern ? D_80172060; -//extern ? D_80172068; -//extern ? D_80172070; -//extern ? D_801722F0; -//extern ? D_801722F4; -//extern ? D_801722F8; -//extern ? D_80172304; -//extern ? D_80172584; -//extern ? D_80172588; -//extern ? D_80172594; -//extern ? D_80172598; -//extern ? D_801725A0; -//extern ? D_801725AC; -//extern ? D_801725B8; -//extern ? D_801725E8; -//extern ? D_80172618; -//extern ? D_80172699; -extern f32* D_801726A0; -//extern ? D_801726A4; -//extern ? D_801726AC; -//extern ? D_801726B0; -//extern ? D_8017280A; -//extern ? D_8017280B; -//extern ? D_8017280C; -//extern ? D_8017280D; -//extern ? D_801729A8; -//extern ? D_80172C30; -//extern ? D_80172CA0; -//extern ? D_80174C30; -//extern ? D_80174CA0; -//extern ? D_80174D08; -extern NotePool gNoteFreeLists; +extern AudioContext gAudioContext; // at 0x8016f180 +extern NotePool gNoteFreeLists; // probably includes this and further members, too //extern ? D_80174D28; //extern ? D_80174D38; //extern ? D_80174D48; diff --git a/include/z64audio.h b/include/z64audio.h index 610f9f828a..2561891cd6 100644 --- a/include/z64audio.h +++ b/include/z64audio.h @@ -3,501 +3,16 @@ /** * Structs in this repository have primarily been imported from the SM64 Decompilation. - * Many things likely still need shifted around and structs need adjusted. - * Take sizes and locations of structs as very volatile. - * The symbol '!' next to an offset means the member is confirmed. + * Many struct members are wrong; the symbol '?' next to an offset means the member is a guess. */ -struct Note; -struct NotePool; -struct SequenceChannel; -struct SequenceChannelLayer; - -typedef struct AudioListItem { - // A node in a circularly linked list. Each node is either a head or an item: - // - Items can be either detached (prev = NULL), or attached to a list. - // 'value' points to something of interest. - // - List heads are always attached; if a list is empty, its head points - // to itself. 'count' contains the size of the list. - // If the list holds notes, 'pool' points back to the pool where it lives. - // Otherwise, that member is NULL. - /*!0x00 */ struct AudioListItem* prev; - /*!0x04 */ struct AudioListItem* next; - /*!0x08 */ union { - void* value; // either Note* or SequenceChannelLayer* - s32 count; - } u; - /*!0x0C */ struct NotePool* pool; -} AudioListItem; // size = 0x10 - -typedef struct NotePool { - /*!0x00 */ AudioListItem disabled; - /*!0x10 */ AudioListItem decaying; - /*!0x20 */ AudioListItem releasing; - /*!0x30 */ AudioListItem active; -} NotePool; - -// Pitch sliding by up to one octave in the positive direction. Negative -// direction is "supported" by setting extent to be negative. The code -// exterpolates exponentially in the wrong direction in that case, but that -// doesn't prevent seqplayer from doing it, AFAICT. -typedef struct { - /*!0x00 */ u8 mode; // bit 0x80 denotes something; the rest are an index 0-5 - /*!0x02 */ u16 cur; - /*!0x04 */ u16 speed; - /*!0x08 */ f32 extent; -} Portamento; // size = 0xC - -typedef struct { - s16 delay; - s16 arg; -} AdsrEnvelope; // size = 0x4 - -typedef struct { - u32 start; - u32 end; - u32 count; - char unk_0C[0x4]; - s16 state[16]; // only exists if count != 0. 8-byte aligned -} AdpcmLoop; - -typedef struct { - s32 order; - s32 npredictors; - s16 book[1]; // size 8 * order * npredictors. 8-byte aligned -} AdpcmBook; - -typedef struct { - u8 unused; - u8 loaded; - u8* sampleAddr; - AdpcmLoop* loop; - AdpcmBook* book; - u32 sampleSize; // never read. either 0 or 1 mod 9, depending on padding -} AudioBankSample; - -typedef struct { - AudioBankSample* sample; - f32 tuning; // frequency scale factor -} AudioBankSound; // size = 0x8 - -// UNCHANGED -typedef struct { - /* 0x00 */ u8 loaded; - /* 0x01 */ u8 normalRangeLo; - /* 0x02 */ u8 normalRangeHi; - /* 0x03 */ u8 releaseRate; - /* 0x04 */ AdsrEnvelope* envelope; - /* 0x08 */ AudioBankSound lowNotesSound; - /* 0x10 */ AudioBankSound normalNotesSound; - /* 0x18 */ AudioBankSound highNotesSound; -} Instrument; // size >= 0x20 - -typedef struct { - u8 releaseRate; - u8 pan; - u8 loaded; - AudioBankSound sound; - AdsrEnvelope *envelope; -} Drum; // TODO figure out what is still used. - -typedef struct { - u32 unk_0; - u32 unk_4; -} UnkInstrument; // size = 0x8, new struct to OOT - -typedef struct { - /* 0x00 */ u8 numInstruments; - /* 0x01 */ u8 numDrums; - /* 0x02 */ char unk_02[0x02]; - /* 0x04 */ u16 numUnkInstruments; - /* 0x08 */ Instrument** instruments; - /* 0x0C */ Drum** drums; - /* 0x10 */ UnkInstrument* unkInstruments; -} CtlEntry; // size = 0x14 - -typedef struct { - u8* pc; - u8* stack[4]; - u8 remLoopIters[4]; - u8 depth; -} M64ScriptState; // size = 0x1C - -typedef struct { - /* 0x000 */ u8 enabled : 1; - /* 0x000 */ u8 finished : 1; // never read - /*!0x000 */ u8 muted : 1; - /* 0x000 */ u8 seqDmaInProgress : 1; - /* 0x000 */ u8 bankDmaInProgress : 1; - /* 0x000 */ u8 recalculateVolume : 1; - /* 0x000 */ u8 pad_0b2 : 1; - /* 0x000 */ u8 unk_0b1 : 1; - /* 0x001 */ u8 state; - /* 0x002 */ u8 noteAllocPolicy; - /* 0x003 */ u8 muteBehavior; - /* 0x004 */ u8 seqId; - /* 0x005 */ u8 defaultBank[1]; // must be an array to get a comparison - // to match; other u8's might also be part of that array - /* 0x006 */ u8 loadingBankId; - /* 0x007 */ s8 seqVariationEu[1]; - /* 0x008 */ u16 tempo; // beats per minute in JP, tatums per minute in US/EU - /* 0x00A */ u16 tempoAcc; - /* 0x00C */ s16 transposition; - /* 0x00E */ u16 delay; - /* 0x010 */ char pad_010[0x2]; - /* 0x012 */ u16 fadeTimer; - /* 0x014 */ u16 fadeTimerUnkEu; - /* 0x016 */ char pad_016[0x2]; - /* 0x018 */ u8* seqData; - /*!0x01C */ f32 fadeVolume; - /*!0x020 */ f32 fadeVelocity; - /* 0x024 */ f32 volume; - /*!0x028 */ f32 muteVolumeScale; - /*!0x02C */ f32 fadeVolumeScale; - /*!0x030 */ f32 appliedFadeVolume; - /* 0x034 */ f32 unk_34; - /*!0x038 */ struct SequenceChannel* channels[16]; - /* 0x078 */ M64ScriptState scriptState; - /* 0x094 */ u8* shortNoteVelocityTable; - /* 0x098 */ u8* shortNoteDurationTable; - /*!0x09C */ NotePool notePool; - /* 0x0DC */ OSMesgQueue seqDmaMesgQueue; - /* 0x0F4 */ OSMesg seqDmaMesg; - /* 0x0F8 */ OSIoMesg seqDmaIoMesg; - /* 0x110 */ OSMesgQueue bankDmaMesgQueue; - /* 0x128 */ OSMesg bankDmaMesg; - /* 0x12C */ OSIoMesg bankDmaIoMesg; - /* 0x144 */ u8* bankDmaCurrMemAddr; - /* 0x148 */ u32 bankDmaCurrDevAddr; - /* 0x14C */ s32 bankDmaRemaining; -} SequencePlayer; - -typedef struct { - u8 releaseRate; - u8 sustain; - AdsrEnvelope* envelope; -} AdsrSettings; // size = 0x8 - -typedef struct { - /*!0x00 */ union { - struct A { - /* 0x00 */ u8 unk_0b80 : 1; - /*!0x00 */ u8 hang : 1; - /*!0x00 */ u8 decay : 1; - /*!0x00 */ u8 release : 1; - /*!0x00 */ u8 state : 4; - } s; - /*!0x00 */ u8 asByte; - } action; - /*!0x01 */ u8 envIndex; - /*!0x02 */ s16 delay; - /*!0x04 */ f32 sustain; - /*!0x08 */ f32 velocity; - /*!0x0C */ f32 fadeOutVel; - /*!0x10 */ f32 current; - /*!0x14 */ f32 target; - /* */ char pad18[4]; - /*!0x1C */ AdsrEnvelope *envelope; -} AdsrState; - -typedef struct { - u8 bit0 : 1; - u8 bit1 : 1; - u8 bit2 : 2; - u8 strongRight : 1; - u8 strongLeft : 1; - u8 stereoHeadsetEffects : 1; - u8 usesHeadsetPanEffects : 1; -} ReverbBitsData; - -typedef union { - /* 0x00 */ ReverbBitsData s; - /* 0x00 */ u8 asByte; -} ReverbBits; - -typedef struct { - /*!0x00 */ u8 reverb; - /*!0x01 */ u8 unk_1; - /*!0x02 */ u8 pan; - /*!0x03 */ ReverbBits reverbBits; - /*!0x04 */ u8 unk_4; - /*!0x06 */ u16 unk_6; - /*!0x08 */ f32 freqScale; - /*!0x0C */ f32 velocity; - /*!0x10 */ s16* unk_10; - /*!0x14 */ s16 unk_14[8]; -} NoteAttributes; // size = 0x24 - -typedef struct SequenceChannel { - /* 0x00 */ u8 enabled : 1; - /* 0x00 */ u8 finished : 1; - /* 0x00 */ u8 stopScript : 1; - /* 0x00 */ u8 stopSomething2 : 1; // sets SequenceChannelLayer.stopSomething - /* 0x00 */ u8 hasInstrument : 1; - /*!0x00 */ u8 stereoHeadsetEffects : 1; - /* 0x00 */ u8 largeNotes : 1; // notes specify duration and velocity - /* 0x00 */ u8 unused : 1; // never read, set to 0 - union { - struct { - /*!0x01 */ u8 freqScale : 1; - /*!0x01 */ u8 volume : 1; - /*!0x01 */ u8 pan : 1; - } s; - /*!0x01 */ u8 asByte; - } changes; - /*!0x02 */ u8 noteAllocPolicy; - /*!0x03 */ u8 muteBehavior; - /*!0x04 */ u8 reverb; // or dry/wet mix - /*!0x05 */ u8 notePriority; // 0-3 - /* 0x06 */ u8 someOtherPriority; - /*!0x07 */ u8 bankId; - /*!0x08 */ u8 reverbIndex; - /*!0x09 */ u8 bookOffset; - /*!0x0A */ u8 newPan; - /*!0x0B */ u8 panChannelWeight; // proportion of pan that comes from the channel (0..128) - /* 0x0C */ u8 unk_0C; - /* 0x0D */ u8 padD[2]; - /* 0x0F */ u8 unk_0F; - /*!0x10 */ u16 vibratoRateStart; - /*!0x12 */ u16 vibratoExtentStart; - /*!0x14 */ u16 vibratoRateTarget; - /*!0x16 */ u16 vibratoExtentTarget; - /*!0x18 */ u16 vibratoRateChangeDelay; - /*!0x1A */ u16 vibratoExtentChangeDelay; - /*!0x1C */ u16 vibratoDelay; - /* 0x1E */ u16 delay; - /* 0x20 */ u16 unk_20; - /* 0x22 */ u16 pad22; - /*!0x24 */ s16 instOrWave; // either 0 (none), instrument index + 1, or - // 0x80..0x83 for sawtooth/triangle/sine/square waves. - /* 0x26 */ s16 transposition; - /*!0x28 */ f32 volumeScale; - /*!0x2C */ f32 volume; - /*!0x30 */ s32 pan; - /*!0x34 */ f32 appliedVolume; - /* 0x38 */ f32 freqScale; - /* 0x3C */ u8 (*dynTable)[][2]; - /* 0x40 */ struct Note* noteUnused; // never read - /* 0x44 */ struct SequenceChannelLayer* layerUnused; // never read - /* 0x48 */ Instrument* instrument; - /*!0x4C */ SequencePlayer* seqPlayer; - /*!0x54 */ struct SequenceChannelLayer* layers[4]; - /* 0x64 */ M64ScriptState scriptState; - /* */ AdsrSettings adsr; - /*!0x84 */ NotePool notePool; - /* 0xC4 */ s8 soundScriptIO[8]; // bridge between sound script and audio lib - /* 0xCC */ s16* unk_CC; - /* 0xD0 */ ReverbBits reverbBits; - /* 0xD1 */ char unk_D1[0x3]; -} SequenceChannel; - -// Maybe SequenceTrack? -typedef struct SequenceChannelLayer { - /* 0x00 */ u8 enabled : 1; - /* 0x00 */ u8 finished : 1; - /* 0x00 */ u8 stopSomething : 1; // ? - /* 0x00 */ u8 continuousNotes : 1; // keep the same note for consecutive notes with the same sound - /* 0x00 */ u8 unusedEu0b8 : 1; - /* 0x00 */ u8 bit2 : 1; - /* 0x00 */ u8 ignoreDrumPan : 1; // (wrong) - /* 0x00 */ u8 notePropertiesNeedInit : 1; - /*!0x01 */ ReverbBits reverbBits; - /* 0x02 */ u8 instOrWave; - /* 0x03 */ u8 status; - /* 0x04 */ u8 noteDuration; // set to 0x80 - /* 0x05 */ u8 portamentoTargetNote; - /*!0x06 */ u8 pan; // 0..128 - /*!0x07 */ u8 notePan; - /* 0x08 */ u16 portamentoTime; - /* 0x0A */ 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) - /* 0x0C */ f32 unk0C; - /* 0x10 */ s16 delay; // (wrong) - /* 0x12 */ s16 duration; // (wrong) - /* 0x14 */ f32 unk14; - /* 0x18 */ AdsrSettings adsr; - /*!0x20 */ Portamento portamento; - /*!0x2C */ struct Note* note; - /*!0x30 */ f32 freqScale; - /* 0x34 */ s16 shortNoteDefaultPlayPercentage; - /* 0x36 */ s16 playPercentage; // it's not really a percentage... - /*!0x38 */ f32 velocitySquare; - /* 0x3C */ s16 delayUnused; // set to 'delay', never read - /*!0x40 */ f32 noteVelocity; - /*!0x44 */ f32 noteFreqScale; - /* 0x48 */ Instrument* instrument; - /*!0x4C */ AudioBankSound* sound; - /*!0x50 */ SequenceChannel* seqChannel; - /* 0x54 */ M64ScriptState scriptState; - /* 0x70 */ AudioListItem listItem; - /* 0x80 */ char unk_80[0x10]; -} SequenceChannelLayer; - -typedef struct { - s16 adpcmdecState[0x10]; - s16 finalResampleState[0x10]; - s16 mixEnvelopeState[0x28]; - s16 panResampleState[0x10]; - s16 panSamplesBuffer[0x20]; - s16 dummyResampleState[0x10]; -} NoteSynthesisBuffers; - -typedef struct { - /* 0x00 */ u8 restart; - /* 0x01 */ u8 sampleDmaIndex; - /* 0x02 */ u8 prevHeadsetPanRight; - /* 0x03 */ u8 prevHeadsetPanLeft; - /* 0x04 */ u16 samplePosFrac; - /* 0x08 */ s32 samplePosInt; - /* 0x0C */ NoteSynthesisBuffers* synthesisBuffers; - /* 0x10 */ s16 curVolLeft; - /* 0x12 */ s16 curVolRight; -} NoteSynthesisState; - -typedef struct { - /*!0x00 */ struct SequenceChannel* seqChannel; // unless this changed to a layer...? - /*!0x04 */ u32 time; - /*!0x08 */ s16* curve; - /*!0x0C */ f32 extent; - /*!0x10 */ f32 rate; - /*!0x14 */ u8 active; - /*!0x16 */ u16 rateChangeTimer; - /*!0x18 */ u16 extentChangeTimer; - /*!0x1A */ u16 delay; -} VibratoState; // size = 0x1C - -typedef struct { - /*!0x00 */ u8 priority; - /*!0x01 */ u8 waveId; - /*!0x02 */ u8 sampleCountIndex; - /* 0x03 */ u8 bankId; - /* 0x04 */ u8 unk_04; - /* 0x05 */ u8 stereoHeadsetEffects; - /* 0x06 */ s16 adsrVolScale; - /*!0x08 */ f32 portamentoFreqScale; - /*!0x0C */ f32 vibratoFreqScale; - /* 0x10 */ SequenceChannelLayer* prevParentLayer; - /*!0x14 */ SequenceChannelLayer* parentLayer; - /*!0x18 */ SequenceChannelLayer* wantedParentLayer; - /*!0x1C */ NoteAttributes attributes; - /*!0x40 */ AdsrState adsr; - // may contain portamento, vibratoState, if those are not part of Note itself -} NotePlaybackState; - -typedef struct { - // (This might be a ReverbBits, and asByte might not exist) - union { - struct { - /* 0x00 */ volatile u8 enabled : 1; - /* 0x00 */ u8 needsInit : 1; - /* 0x00 */ u8 finished : 1; - /* 0x00 */ u8 envMixerNeedsInit : 1; - /*!0x00 */ u8 stereoStrongRight : 1; - /*!0x00 */ u8 stereoStrongLeft : 1; - /* 0x00 */ u8 stereoHeadsetEffects : 1; - /* 0x00 */ u8 usesHeadsetPanEffects : 1; - } s; - /* 0x00 */ u8 asByte; - } bitField0; - union { - struct { - /* 0x01 */ u8 reverbIndex : 3; - /*!0x01 */ u8 bookOffset : 2; - /* 0x01 */ u8 bit2 : 1; - /* 0x01 */ u8 isSyntheticWave : 1; - /* 0x01 */ u8 hasTwoAdpcmParts : 1; - } s; - /* 0x01 */ u8 asByte; - } bitField1; - /* 0x02 */ u8 unk_2; - /* 0x03 */ u8 headsetPanRight; - /* 0x04 */ u8 headsetPanLeft; - /* 0x05 */ u8 reverbVol; - /* 0x06 */ u8 unk_06; // sound shifted by 4. - /* 0x07 */ u8 unk_07; // sound shifted by 4. - /*!0x08 */ u16 targetVolLeft; - /*!0x0A */ u16 targetVolRight; - /* 0x0C */ u16 resamplingRateFixedPoint; // stored as signed but loaded as u16 - /* 0x0E */ s16 unk_10; - /*!0x10 */ union { - s16* samples; - AudioBankSound* audioBankSound; - } sound; - /* 0x14 */ s16* unk_14; - /* 0x18 */ char pad_18[0x8]; -} NoteSubEu; // size = 0x20 - -typedef struct Note { - /*!0x00 */ AudioListItem listItem; - /* 0x10 */ NoteSynthesisState synthesisState; - /* 0x24 */ char pad_24[0xC]; - /*!0x30 */ NotePlaybackState playbackState; - /*!0x90 */ Portamento portamento; - /*!0x9C */ VibratoState vibratoState; // size 0x1C - /* 0xB8 */ char pad_B8[0x4]; - /* 0xBC */ u32 unk_BC; - /*!0xC0 */ NoteSubEu noteSubEu; -} Note; // size = 0xE0 - -typedef struct { - /* 0x00 */ s16 presetUnk4; // audio frames per vsync? - /* 0x02 */ u16 frequency; - /* 0x04 */ u16 aiFrequency; // ?16 - /* 0x06 */ s16 samplesPerFrameTarget; - /* 0x08 */ s16 maxAiBufferLength; - /* 0x0A */ s16 minAiBufferLength; - /* 0x0C */ s16 updatesPerFrame; - /* 0x0E */ s16 samplesPerUpdate; - /* 0x10 */ s16 samplesPerUpdateMax; - /* 0x12 */ s16 samplesPerUpdateMin; - /* 0x14 */ f32 resampleRate; // contains 32000.0f / frequency - /* 0x18 */ f32 updatesPerFrameInv; // 1.0f / updatesPerFrame - /* 0x1C */ f32 unkUpdatesPerFrameScaled; // 3.0f / (1280.0f * updatesPerFrame) -} AudioBufferParametersEU; - -typedef struct { - u8* start; - u8* cur; - u32 size; - s32 unused; // set to 0, never read -} SoundAllocPool; - -typedef struct { - /* 0x0000 */ char unk_0000[0x14]; - /* 0x0014 */ NoteSubEu* gNoteSubsEu; - /* 0x0018 */ char unk_0014[0x282C]; - /* 0x2844 */ CtlEntry* gCtlEntries; - /* 0x2848 */ char unk_2848[0x4]; - /* 0x284C */ AudioBufferParametersEU gAudioBufferParameters; - /* 0x286C */ char unk_286C[0x28]; - /* 0x2894 */ s32 gMaxSimultaneousNotes; - /* 0x2898 */ char unk_2898[0xE8]; - /* 0x2980 */ s32 gAudioErrorFlags; - /* 0x2984 */ char unk_2984[0x3C]; - /* 0x29C0 */ SoundAllocPool gNotesAndBuffersPool; - /* 0x29D0 */ char unk_29D0[0x0B5C]; - /* 0x352C */ Note* gNotes; - /* 0x3530 */ char unk_3530[0x2654]; - /* 0x5B84 */ s32 gNoteSubEuOffset; -} AudioContext; - -typedef struct { - /*!0x00 */ u8 reverb; // volume - /* 0x01 */ u8 unk_1; - /*!0x02 */ u8 pan; - /*!0x03 */ ReverbBits reverbBits; - /*!0x04 */ f32 frequency; - /*!0x08 */ f32 velocity; - /* 0x0C */ char unk_0C[0x4]; - /* 0x10 */ s16* unk_10; - /* 0x14 */ u8 unk_14; - /* 0x16 */ u16 unk_16; -} Reverb; // size = 0x1C (May be longer) - #define NO_LAYER ((SequenceChannelLayer*)(-1)) #define NO_CHANNEL ((SequenceChannel*)(-1)) +#define TATUMS_PER_BEAT 48 + +#define IS_SEQUENCE_CHANNEL_VALID(ptr) ((u32)(ptr) != (u32)&gAudioContext.gSequenceChannelNone) + #define ADSR_STATE_DISABLED 0 #define ADSR_STATE_INITIAL 1 #define ADSR_STATE_START_LOOP 2 @@ -513,4 +28,552 @@ typedef struct { #define ADSR_GOTO -2 #define ADSR_RESTART -3 +struct Note; +struct NotePool; +struct SequenceChannel; +struct SequenceChannelLayer; + +typedef struct AudioListItem { + // A node in a circularly linked list. Each node is either a head or an item: + // - Items can be either detached (prev = NULL), or attached to a list. + // 'value' points to something of interest. + // - List heads are always attached; if a list is empty, its head points + // to itself. 'count' contains the size of the list. + // If the list holds notes, 'pool' points back to the pool where it lives. + // Otherwise, that member is NULL. + /* 0x00 */ struct AudioListItem* prev; + /* 0x04 */ struct AudioListItem* next; + /* 0x08 */ union { + void* value; // either Note* or SequenceChannelLayer* + s32 count; + } u; + /* 0x0C */ struct NotePool* pool; +} AudioListItem; // size = 0x10 + +typedef struct NotePool { + /* 0x00 */ AudioListItem disabled; + /* 0x10 */ AudioListItem decaying; + /* 0x20 */ AudioListItem releasing; + /* 0x30 */ AudioListItem active; +} NotePool; + +// Pitch sliding by up to one octave in the positive direction. Negative +// direction is "supported" by setting extent to be negative. The code +// exterpolates exponentially in the wrong direction in that case, but that +// doesn't prevent seqplayer from doing it, AFAICT. +typedef struct { + /* 0x00 */ u8 mode; // bit 0x80 denotes something; the rest are an index 0-5 + /* 0x02 */ u16 cur; + /* 0x04 */ u16 speed; + /* 0x08 */ f32 extent; +} Portamento; // size = 0xC + +typedef struct { + /*?0x0 */ s16 delay; + /*?0x2 */ s16 arg; +} AdsrEnvelope; // size = 0x4? + +typedef struct { + /*?0x00 */ u32 start; + /* 0x04 */ u32 end; + /*?0x08 */ u32 count; + /*?0x0C */ char unk_0C[0x4]; + /*?0x10 */ s16 state[16]; // only exists if count != 0. 8-byte aligned +} AdpcmLoop; + +typedef struct { + /*?0x00 */ s32 order; + /*?0x04 */ s32 npredictors; + /*?0x08 */ s16 book[1]; // size 8 * order * npredictors. 8-byte aligned +} AdpcmBook; + +typedef struct { + /* 0x00 */ u8 bits4 : 4; + /* 0x00 */ u8 bits2 : 2; + /*?0x01 */ u8 loaded; + /*?0x04 */ u8* sampleAddr; + /* 0x08 */ AdpcmLoop* loop; + /*?0x0C */ AdpcmBook* book; + /*?0x10 */ u32 sampleSize; // never read. either 0 or 1 mod 9, depending on padding +} AudioBankSample; + +typedef struct { + /* 0x00 */ AudioBankSample* sample; + /* 0x04 */ f32 tuning; // frequency scale factor +} AudioBankSound; // size = 0x8 + +typedef struct { + // contained within a larger struct, struct might not start at offset zero + /* 0x00 */ AudioBankSound sound; // offset might be wrong + /* 0x10 */ u8 pad[0x2c0]; +} LargeSound; // size = 0x2C8 + +typedef struct { + /*?0x00 */ u8 loaded; + /* 0x01 */ u8 normalRangeLo; + /* 0x02 */ u8 normalRangeHi; + /* 0x03 */ u8 releaseRate; + /* 0x04 */ AdsrEnvelope* envelope; + /* 0x08 */ AudioBankSound lowNotesSound; + /* 0x10 */ AudioBankSound normalNotesSound; + /* 0x18 */ AudioBankSound highNotesSound; +} Instrument; // size >= 0x20 + +typedef struct { + /* 0x00 */ u8 releaseRate; + /* 0x01 */ u8 pan; + /*?0x02 */ u8 loaded; + /* 0x04 */ AudioBankSound sound; + /* 0x14 */ AdsrEnvelope *envelope; +} Drum; // size >= 0x14 + +typedef struct { + u32 unk_0; + u32 unk_4; +} UnkInstrument; // TODO: probably the same as AudioBankSound + +typedef struct { + /* 0x00 */ u8 numInstruments; + /* 0x01 */ u8 numDrums; + /* 0x02 */ char unk_02[0x02]; + /* 0x04 */ u16 numUnkInstruments; + /* 0x08 */ Instrument** instruments; + /* 0x0C */ Drum** drums; + /* 0x10 */ UnkInstrument* unkInstruments; +} CtlEntry; // size = 0x14 + +typedef struct { + /* 0x00 */ u8* pc; + /* 0x04 */ u8* stack[4]; + /* 0x14 */ u8 remLoopIters[4]; + /* 0x18 */ u8 depth; + /* 0x19 */ s8 value; +} M64ScriptState; // size = 0x1C + +// Also known as a Group, according to sm64 debug strings. +typedef struct { + /* 0x000 */ u8 enabled : 1; + /*?0x000 */ u8 finished : 1; + /* 0x000 */ u8 muted : 1; + /* 0x000 */ u8 seqDmaInProgress : 1; + /* 0x000 */ u8 bankDmaInProgress : 1; + /*?0x000 */ u8 recalculateVolume : 1; + /* 0x000 */ u8 unk_0b2 : 1; + /* 0x000 */ u8 unk_0b1 : 1; + /* 0x001 */ u8 state; + /* 0x002 */ u8 noteAllocPolicy; + /* 0x003 */ u8 muteBehavior; + /* 0x004 */ u8 seqId; + /* 0x005 */ u8 defaultBank; + /*?0x006 */ u8 loadingBankId; + /*?0x007 */ s8 seqVariationEu[1]; + /* 0x008 */ u16 tempo; // tatums per minute + /* 0x00A */ u16 tempoAcc; + /* 0x00C */ u16 unk_0C; + /* 0x00E */ s16 transposition; + /* 0x010 */ u16 delay; + /* 0x012 */ u16 fadeTimer; + /* 0x014 */ u16 fadeTimerUnkEu; + /* 0x016 */ char pad_16[0x2]; + /* 0x018 */ u8* seqData; + /* 0x01C */ f32 fadeVolume; + /* 0x020 */ f32 fadeVelocity; + /* 0x024 */ f32 volume; + /* 0x028 */ f32 muteVolumeScale; + /* 0x02C */ f32 fadeVolumeScale; + /* 0x030 */ f32 appliedFadeVolume; + /* 0x034 */ f32 unk_34; + /* 0x038 */ struct SequenceChannel* channels[16]; + /*?0x078 */ M64ScriptState scriptState; + /* 0x094 */ u8* shortNoteVelocityTable; + /* 0x098 */ u8* shortNoteDurationTable; + /* 0x09C */ NotePool notePool; + /* 0x0DC */ s32 unk_DC; + /* 0x0D0 */ u32 unk_E0; + /* 0x0E4 */ u8 pad_E4[0x10]; // OSMesgQueue seqDmaMesgQueue; + /*?0x0F4 */ OSMesg seqDmaMesg; + /*?0x0F8 */ OSIoMesg seqDmaIoMesg; + /*?0x110 */ OSMesgQueue bankDmaMesgQueue; + /*?0x128 */ OSMesg bankDmaMesg; + /*?0x12C */ OSIoMesg bankDmaIoMesg; + /*?0x144 */ u8* bankDmaCurrMemAddr; + /*?0x148 */ u32 bankDmaCurrDevAddr; + /*?0x14C */ s32 bankDmaRemaining; + /* */ u8 pad_150[8]; + /* 0x158 */ s8 unk_158[8]; // seqVariationEu? soundScriptIO? +} SequencePlayer; // size = 0x160 + +typedef struct { + /* 0x0 */ u8 releaseRate; + /* 0x1 */ u8 sustain; + /* 0x4 */ AdsrEnvelope* envelope; +} AdsrSettings; // size = 0x8 + +typedef struct { + /* 0x00 */ union { + struct A { + /* 0x00 */ u8 unk_0b80 : 1; + /* 0x00 */ u8 hang : 1; + /* 0x00 */ u8 decay : 1; + /* 0x00 */ u8 release : 1; + /* 0x00 */ u8 state : 4; + } s; + /* 0x00 */ u8 asByte; + } action; + /* 0x01 */ u8 envIndex; + /* 0x02 */ s16 delay; + /* 0x04 */ f32 sustain; + /* 0x08 */ f32 velocity; + /* 0x0C */ f32 fadeOutVel; + /* 0x10 */ f32 current; + /* 0x14 */ f32 target; + /* */ char pad_18[4]; + /* 0x1C */ AdsrEnvelope *envelope; +} AdsrState; + +typedef struct { + /* 0x00 */ u8 bit0 : 1; + /* 0x00 */ u8 bit1 : 1; + /* 0x00 */ u8 bit2 : 2; + /* 0x00 */ u8 strongRight : 1; + /* 0x00 */ u8 strongLeft : 1; + /* 0x00 */ u8 stereoHeadsetEffects : 1; + /* 0x00 */ u8 usesHeadsetPanEffects : 1; +} ReverbBitsData; + +typedef union { + /* 0x00 */ ReverbBitsData s; + /* 0x00 */ u8 asByte; +} ReverbBits; + +typedef struct { + /* 0x00 */ u8 reverb; + /* 0x01 */ u8 unk_1; + /* 0x02 */ u8 pan; + /* 0x03 */ ReverbBits reverbBits; + /* 0x04 */ u8 unk_4; + /* 0x06 */ u16 unk_6; + /* 0x08 */ f32 freqScale; + /* 0x0C */ f32 velocity; + /* 0x10 */ s16* unk_10; + /* 0x14 */ s16 unk_14[8]; +} NoteAttributes; // size = 0x24 + +// Also known as a SubTrack, according to sm64 debug strings. +// Confusingly, a SubTrack is a container of Tracks. +typedef struct SequenceChannel { + /* 0x00 */ u8 enabled : 1; + /* 0x00 */ u8 finished : 1; + /* 0x00 */ u8 stopScript : 1; + /* 0x00 */ u8 stopSomething2 : 1; // sets SequenceChannelLayer.stopSomething + /* 0x00 */ u8 hasInstrument : 1; + /* 0x00 */ u8 stereoHeadsetEffects : 1; + /* 0x00 */ u8 largeNotes : 1; // notes specify duration and velocity + /* 0x00 */ u8 unused : 1; // still unused? + union { + struct { + /* 0x01 */ u8 freqScale : 1; + /* 0x01 */ u8 volume : 1; + /* 0x01 */ u8 pan : 1; + } s; + /* 0x01 */ u8 asByte; + } changes; + /* 0x02 */ u8 noteAllocPolicy; + /* 0x03 */ u8 muteBehavior; + /* 0x04 */ u8 reverb; // or dry/wet mix + /* 0x05 */ u8 notePriority; // 0-3 + /* 0x06 */ u8 someOtherPriority; + /* 0x07 */ u8 bankId; + /* 0x08 */ u8 reverbIndex; + /* 0x09 */ u8 bookOffset; + /* 0x0A */ u8 newPan; + /* 0x0B */ u8 panChannelWeight; // proportion of pan that comes from the channel (0..128) + /* 0x0C */ u8 unk_0C; + /* 0x0D */ u8 velocityRandomVariance; + /* 0x0E */ u8 durationRandomVariance; + /* 0x0F */ u8 unk_0F; + /* 0x10 */ u16 vibratoRateStart; + /* 0x12 */ u16 vibratoExtentStart; + /* 0x14 */ u16 vibratoRateTarget; + /* 0x16 */ u16 vibratoExtentTarget; + /* 0x18 */ u16 vibratoRateChangeDelay; + /* 0x1A */ u16 vibratoExtentChangeDelay; + /* 0x1C */ u16 vibratoDelay; + /* 0x1E */ u16 delay; + /* 0x20 */ u16 unk_20; + /* 0x22 */ u16 pad_22; + /* 0x24 */ s16 instOrWave; // either 0 (none), instrument index + 1, or + // 0x80..0x83 for sawtooth/triangle/sine/square waves. + /* 0x26 */ s16 transposition; + /* 0x28 */ f32 volumeScale; + /* 0x2C */ f32 volume; + /* 0x30 */ s32 pan; + /* 0x34 */ f32 appliedVolume; + /* 0x38 */ f32 freqScale; + /*?0x3C */ u8 (*dynTable)[][2]; + /* 0x40 */ struct Note* noteUnused; // still unused? + /*?0x44 */ struct SequenceChannelLayer* layerUnused; // still unused? + /* 0x48 */ Instrument* instrument; + /* 0x4C */ SequencePlayer* seqPlayer; + /* 0x50 */ struct SequenceChannelLayer* layers[4]; + /* 0x60 */ M64ScriptState scriptState; + /* 0x7C */ AdsrSettings adsr; + /* 0x84 */ NotePool notePool; + /* 0xC4 */ s8 soundScriptIO[8]; // bridge between sound script and audio lib + /* 0xCC */ s16* unk_CC; + /* 0xD0 */ ReverbBits reverbBits; +} SequenceChannel; // size = 0xD4 + +// Also known as a Track, according to sm64 debug strings. +typedef struct SequenceChannelLayer { + /* 0x00 */ u8 enabled : 1; + /* 0x00 */ u8 finished : 1; + /* 0x00 */ u8 stopSomething : 1; + /* 0x00 */ u8 continuousNotes : 1; // keep the same note for consecutive notes with the same sound + /* 0x00 */ u8 bit3 : 1; // "loaded"? + /* 0x00 */ u8 ignoreDrumPan : 1; + /* 0x00 */ u8 bit1 : 1; // "has initialized continuous notes"? + /* 0x00 */ u8 notePropertiesNeedInit : 1; + /* 0x01 */ ReverbBits reverbBits; + /* 0x02 */ u8 instOrWave; + /* 0x03 */ u8 noteDuration; + /* 0x04 */ u8 semitone; + /* 0x05 */ u8 portamentoTargetNote; + /* 0x06 */ u8 pan; // 0..128 + /* 0x07 */ u8 notePan; + /* 0x08 */ s16 delay; + /* 0x0A */ s16 duration; + /* 0x0C */ s16 delay2; + /* 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) + /* 0x12 */ s16 shortNoteDefaultPlayPercentage; + /* 0x14 */ s16 playPercentage; + /* 0x18 */ AdsrSettings adsr; + /* 0x20 */ Portamento portamento; + /* 0x2C */ struct Note* note; + /* 0x30 */ f32 freqScale; + /* 0x34 */ f32 unk_34; + /* 0x38 */ f32 velocitySquare2; + /* 0x3C */ f32 velocitySquare; // not sure which one of those corresponds to the sm64 original + /* 0x40 */ f32 noteVelocity; + /* 0x44 */ f32 noteFreqScale; + /* 0x48 */ Instrument* instrument; + /* 0x4C */ AudioBankSound* sound; + /* 0x50 */ SequenceChannel* seqChannel; + /* 0x54 */ M64ScriptState scriptState; + /* 0x70 */ AudioListItem listItem; +} 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; + +typedef struct { + /*?0x00 */ u8 restart; + /*?0x01 */ u8 sampleDmaIndex; + /*?0x02 */ u8 prevHeadsetPanRight; + /*?0x03 */ u8 prevHeadsetPanLeft; + /*?0x04 */ u16 samplePosFrac; + /*?0x08 */ s32 samplePosInt; + /* 0x0C */ NoteSynthesisBuffers* synthesisBuffers; + /*?0x10 */ s16 curVolLeft; + /*?0x12 */ s16 curVolRight; +} NoteSynthesisState; + +typedef struct { + /* 0x00 */ struct SequenceChannel* seqChannel; + /* 0x04 */ u32 time; + /* 0x08 */ s16* curve; + /* 0x0C */ f32 extent; + /* 0x10 */ f32 rate; + /* 0x14 */ u8 active; + /*!0x16 */ u16 rateChangeTimer; + /* 0x18 */ u16 extentChangeTimer; + /* 0x1A */ u16 delay; +} VibratoState; // size = 0x1C + +typedef struct { + /* 0x00 */ u8 priority; + /* 0x01 */ u8 waveId; + /* 0x02 */ u8 sampleCountIndex; + /* 0x03 */ u8 bankId; + /* 0x04 */ u8 unk_04; + /* 0x05 */ u8 stereoHeadsetEffects; + /* 0x06 */ s16 adsrVolScale; // unused? + /* 0x08 */ f32 portamentoFreqScale; + /* 0x0C */ f32 vibratoFreqScale; + /*?0x10 */ SequenceChannelLayer* prevParentLayer; + /* 0x14 */ SequenceChannelLayer* parentLayer; + /* 0x18 */ SequenceChannelLayer* wantedParentLayer; + /* 0x1C */ NoteAttributes attributes; + /* 0x40 */ AdsrState adsr; + // may contain portamento, vibratoState, if those are not part of Note itself +} NotePlaybackState; + +typedef struct { + // these bitfields should perhaps be merged into a single struct + union { + struct { + /*?0x00 */ volatile u8 enabled : 1; + /* 0x00 */ u8 needsInit : 1; + /*?0x00 */ u8 finished : 1; + /*?0x00 */ u8 envMixerNeedsInit : 1; + /* 0x00 */ u8 stereoStrongRight : 1; + /* 0x00 */ u8 stereoStrongLeft : 1; + /* 0x00 */ u8 stereoHeadsetEffects : 1; + /* 0x00 */ u8 usesHeadsetPanEffects : 1; + } s; + /*?0x00 */ u8 asByte; + } bitField0; + union { + struct { + /*?0x01 */ u8 reverbIndex : 3; + /* 0x01 */ u8 bookOffset : 2; + /*?0x01 */ u8 bit2 : 1; + /*?0x01 */ u8 isSyntheticWave : 1; + /*?0x01 */ u8 hasTwoAdpcmParts : 1; + } s; + /*?0x01 */ u8 asByte; + } bitField1; + /* 0x02 */ u8 unk_2; + /*?0x03 */ u8 headsetPanRight; + /*?0x04 */ u8 headsetPanLeft; + /*?0x05 */ u8 reverbVol; + /* 0x06 */ u8 unk_06; + /* 0x07 */ u8 unk_07; + /* 0x08 */ u16 targetVolLeft; + /* 0x0A */ u16 targetVolRight; + /*?0x0C */ u16 resamplingRateFixedPoint; // stored as signed but loaded as u16 + /* 0x0E */ s16 unk_10; + /* 0x10 */ union { + s16* samples; + AudioBankSound* audioBankSound; + } sound; // not sure if actually a union + /* 0x14 */ s16* unk_14; + /* 0x18 */ char pad_18[0x8]; +} NoteSubEu; // size = 0x20 + +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]; + /* 0xBC */ u32 unk_BC; + /* 0xC0 */ NoteSubEu noteSubEu; +} Note; // size = 0xE0 + +typedef struct { + // everything here is wildly wrong, and the struct might not start at + // zero (it's embedded into another struct) + /*?0x00 */ s16 presetUnk4; // audio frames per vsync? + /*?0x02 */ u16 frequency; + /*?0x04 */ u16 aiFrequency; // ?16 + /*?0x06 */ s16 samplesPerFrameTarget; + /* 0x08 */ s16 unk_08; // maxAiBufferLength; + /*?0x0A */ s16 minAiBufferLength; + /*?0x0C */ s16 updatesPerFrame; + /*?0x0E */ s16 samplesPerUpdate; + /* 0x10 */ s16 unk_10; // samplesPerUpdateMax; + /*?0x12 */ s16 samplesPerUpdateMin; + /* 0x14 */ f32 resampleRate; // contains 32000.0f / frequency + /* 0x18 */ f32 updatesPerFrameInv; // 1.0f / updatesPerFrame + /*?0x1C */ f32 unkUpdatesPerFrameScaled; // 3.0f / (1280.0f * updatesPerFrame) +} AudioBufferParametersEU; + +typedef struct { + /* 0x0 */ u8* start; + /* 0x4 */ u8* cur; + /* 0x8 */ u32 size; + /* 0xC */ s32 unused; // set to 0, never read +} SoundAllocPool; // size = 0x10 + +typedef struct { + /* 0x0 */ u8 *ptr; + /*?0x4 */ u32 size; + /* */ u16 pad; + /* 0xA */ s16 id; // seqId or bankId +} SeqOrBankEntry; // size = 0xC + +typedef struct +{ + /* 0x00*/ u32 numEntries; + /* 0x04*/ SoundAllocPool pool; + /*?0x14*/ SeqOrBankEntry entries[16]; +} PersistentPool; // size = 0xD4 + +typedef struct +{ + /* 0x00*/ u32 nextSide; + /* 0x04*/ SoundAllocPool pool; + /* 0x14*/ SeqOrBankEntry entries[2]; +} TemporaryPool; // size = 0x3C + +typedef struct +{ + /* 0x000*/ PersistentPool persistent; + /* 0x0D4*/ TemporaryPool temporary; + /* 0x100*/ u8 pad[0x10]; +} SoundMultiPool; // size = 0x110 + +typedef struct { + /* 0x0000 */ char unk_0000[0x14]; + /* 0x0014 */ NoteSubEu* gNoteSubsEu; + /* 0x0018 */ char unk_0018[0x280]; + /*?0x0298 */ LargeSound largeSounds[1]; // size <= 14, offset might be wrong + /* 0x0560 */ char unk_0560[0x22E4]; + /* 0x2844 */ CtlEntry* gCtlEntries; + /* 0x2848 */ char unk_2848[0x4]; + /*?0x284C */ AudioBufferParametersEU gAudioBufferParameters; // offset might be wrong + /* 0x286C */ f32 unk_286C; + /* 0x2870 */ f32 unk_2870; + /* 0x2874 */ char unk_2874[0x20]; + /* 0x2894 */ s32 gMaxSimultaneousNotes; // (bad name) + /* 0x2898 */ s16 unk_2898; + /* 0x289A */ s8 gSoundMode; + /* 0x289B */ char unk_289B[0xE1]; + /* 0x297C */ u32 gAudioRandom; + /* 0x2980 */ s32 gAudioErrorFlags; + /* 0x2984 */ char unk_2984[0x3C]; + /* 0x29C0 */ SoundAllocPool gNotesAndBuffersPool; + /* 0x29D0 */ char unk_29D0[0x20]; // probably two unused pools + /* 0x29F0 */ SoundAllocPool gSeqAndBankPool; + /* 0x2A00 */ SoundAllocPool gTemporaryCommonPool; + /* 0x2A10 */ SoundAllocPool gPersistentCommonPool; + /* 0x2A20 */ SoundMultiPool gSeqLoadedPool; + /* 0x2B30 */ SoundMultiPool gBankLoadedPool; + /* 0x2C40 */ SoundMultiPool gUnusedLoadedPool; + /* 0x2D50 */ char unk_2D50[0x7D0]; + /* 0x3520 */ f32* unk_3520; + /* 0x3524 */ char unk_3524[8]; + /* 0x352C */ Note* gNotes; + /* 0x3530 */ SequencePlayer gSequencePlayers[4]; + /* 0x3AB0 */ SequenceChannelLayer gSequenceLayers[64]; + /* 0x5AB0 */ SequenceChannel gSequenceChannelNone; + /* 0x5B84 */ s32 gNoteSubEuOffset; + /* 0x5B88 */ AudioListItem gLayerFreeList; +} AudioContext; // might be bigger + +typedef struct { + /* 0x00 */ u8 reverb; // i.e. volume + /* 0x01 */ u8 unk_1; + /* 0x02 */ u8 pan; + /* 0x03 */ ReverbBits reverbBits; + /* 0x04 */ f32 frequency; + /* 0x08 */ f32 velocity; + /* 0x0C */ char unk_0C[0x4]; + /* 0x10 */ s16* unk_10; + /* 0x14 */ u8 unk_14; + /* 0x16 */ u16 unk_16; +} Reverb; // size >= 0x18 + #endif diff --git a/src/code/audio_effects.c b/src/code/audio_effects.c index dac0aa48a7..180f80abaf 100644 --- a/src/code/audio_effects.c +++ b/src/code/audio_effects.c @@ -29,7 +29,7 @@ void Audio_SequenceChannelProcessSound(SequenceChannel* seqChannel, s32 recalcul if (layer != NULL && layer->enabled && layer->note != NULL) { if (layer->notePropertiesNeedInit) { layer->noteFreqScale = layer->freqScale * chanFreqScale; - layer->noteVelocity = layer->velocitySquare * seqChannel->appliedVolume; + layer->noteVelocity = layer->velocitySquare2 * seqChannel->appliedVolume; layer->notePan = (seqChannel->pan + layer->pan * (0x80 - seqChannel->panChannelWeight)) >> 7; layer->notePropertiesNeedInit = 0; } else { @@ -37,7 +37,7 @@ void Audio_SequenceChannelProcessSound(SequenceChannel* seqChannel, s32 recalcul layer->noteFreqScale = layer->freqScale * chanFreqScale; } if (seqChannel->changes.s.volume || recalculateVolume) { - layer->noteVelocity = layer->velocitySquare * seqChannel->appliedVolume; + layer->noteVelocity = layer->velocitySquare2 * seqChannel->appliedVolume; } if (seqChannel->changes.s.pan) { layer->notePan = (seqChannel->pan + layer->pan * (0x80 - seqChannel->panChannelWeight)) >> 7; @@ -258,7 +258,7 @@ f32 Audio_AdsrUpdate(AdsrState* adsr) { break; default: - adsr->delay *= D_801719EC; + adsr->delay *= gAudioContext.unk_286C; if (adsr->delay == 0) { adsr->delay = 1; } diff --git a/src/code/audio_heap.c b/src/code/audio_heap.c index 2d04112445..04d4ae7f68 100644 --- a/src/code/audio_heap.c +++ b/src/code/audio_heap.c @@ -19,35 +19,35 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_800DE2B0.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/Audio_SoundAlloc.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/Audio_AllocDmaMemory.s") #pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_800DE344.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_800DE380.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/Audio_AllocZeroed.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_800DE3DC.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/Audio_Alloc.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_800DE434.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/Audio_SoundAllocPoolInit.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_800DE45C.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/Audio_PersistentPoolClear.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_800DE470.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/Audio_TemporaryPoolClear.s") #pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_800DE4A0.s") #pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_800DE4B0.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_800DE5F0.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/Audio_InitMainPools.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_800DE650.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/Audio_SessionPoolsInit.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_800DE6D4.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/Audio_SeqAndBankPoolInit.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_800DE758.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/Audio_PersistentPoolsInit.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_800DE81C.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/Audio_TemporaryPoolsInit.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_800DE8E0.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/Audio_AllocBankOrSeq.s") #pragma GLOBAL_ASM("asm/non_matchings/code/audio_heap/func_800DF074.s") diff --git a/src/code/audio_playback.c b/src/code/audio_playback.c index 790a5ecd09..08e3b2ca77 100644 --- a/src/code/audio_playback.c +++ b/src/code/audio_playback.c @@ -31,7 +31,7 @@ void Audio_NoteSetVelPanReverb(Note* note, NoteSubEu* sub, Reverb* reverb) { sub->bitField0.s.stereoStrongLeft = 0; sub->bitField0.s.stereoHeadsetEffects = sp24.stereoHeadsetEffects; sub->bitField0.s.usesHeadsetPanEffects = sp24.usesHeadsetPanEffects; - if (stereoHeadsetEffects && gSoundMode == 1) { + if (stereoHeadsetEffects && gAudioContext.gSoundMode == 1) { smallPanIndex = pan >> 1; if (smallPanIndex > 0x3f) { smallPanIndex = 0x3f; @@ -43,7 +43,7 @@ void Audio_NoteSetVelPanReverb(Note* note, NoteSubEu* sub, Reverb* reverb) { volLeft = gHeadsetPanVolume[pan]; volRight = gHeadsetPanVolume[0x7f - pan]; - } else if (stereoHeadsetEffects && gSoundMode == 0) { + } else if (stereoHeadsetEffects && gAudioContext.gSoundMode == 0) { strongLeft = strongRight = 0; sub->headsetPanRight = 0; sub->headsetPanLeft = 0; @@ -77,7 +77,7 @@ void Audio_NoteSetVelPanReverb(Note* note, NoteSubEu* sub, Reverb* reverb) { break; } - } else if (gSoundMode == 3) { + } else if (gAudioContext.gSoundMode == 3) { sub->bitField0.s.stereoHeadsetEffects = 0; sub->bitField0.s.usesHeadsetPanEffects = 0; volLeft = 0.707f; @@ -229,7 +229,7 @@ void Audio_ProcessNotes(void) { } } else { if (playbackState->parentLayer != NO_LAYER) { - playbackState->parentLayer->ignoreDrumPan = 1; // wrong field name + playbackState->parentLayer->bit1 = 1; } Audio_NoteDisable(note); Audio_AudioListRemove(¬e->listItem); @@ -239,7 +239,7 @@ void Audio_ProcessNotes(void) { } } else if (playbackState->adsr.action.s.state == ADSR_STATE_DISABLED) { if (playbackState->parentLayer != NO_LAYER) { - playbackState->parentLayer->ignoreDrumPan = 1; // wrong field name + playbackState->parentLayer->bit1 = 1; } Audio_NoteDisable(note); Audio_AudioListRemove(¬e->listItem); @@ -315,7 +315,7 @@ Instrument* Audio_GetInstrumentInner(s32 bankId, s32 instId) { return NULL; } - if (func_800E18B0(bankId) == 0) { + if (!Audio_IsBankLoadComplete(bankId)) { gAudioContext.gAudioErrorFlags = bankId + 0x10000000; return NULL; } @@ -341,7 +341,7 @@ Drum* Audio_GetDrum(s32 bankId, s32 drumId) { return NULL; } - if (func_800E18B0(bankId) == 0) { + if (!Audio_IsBankLoadComplete(bankId)) { gAudioContext.gAudioErrorFlags = bankId + 0x10000000; return NULL; } @@ -369,7 +369,7 @@ UnkInstrument* Audio_GetUnkInstrument(s32 bankId, s32 unkInstrumentId) { return NULL; } - if (func_800E18B0(bankId) == 0) { + if (!Audio_IsBankLoadComplete(bankId)) { gAudioContext.gAudioErrorFlags = bankId + 0x10000000; return NULL; } @@ -401,27 +401,27 @@ s32 func_800E7744(s32 instrument, s32 bankId, s32 instId, UnkInstrument* arg3) { return -1; } - if (func_800E18B0(bankId) == 0) { + if (!Audio_IsBankLoadComplete(bankId)) { return -2; } switch (instrument) { case 0: - if (instId >= (gAudioContext.gCtlEntries[bankId].numDrums)) { + if (instId >= gAudioContext.gCtlEntries[bankId].numDrums) { return -3; } gAudioContext.gCtlEntries[bankId].drums[instId] = (void*)arg3; break; case 1: - if (instId >= (gAudioContext.gCtlEntries[bankId].numUnkInstruments)) { + if (instId >= gAudioContext.gCtlEntries[bankId].numUnkInstruments) { return -3; } gAudioContext.gCtlEntries[bankId].unkInstruments[instId] = *arg3; break; default: - if (instId >= (gAudioContext.gCtlEntries[bankId].numInstruments)) { + if (instId >= gAudioContext.gCtlEntries[bankId].numInstruments) { return -3; } gAudioContext.gCtlEntries[bankId].instruments[instId] = (void*)arg3; @@ -441,7 +441,7 @@ void Audio_SeqChanLayerDecayRelease(SequenceChannelLayer* seqLayer, s32 target) return; } - seqLayer->unusedEu0b8 = 0; + seqLayer->bit3 = 0; if (seqLayer->note == NULL) { return; @@ -508,9 +508,9 @@ void Audio_SeqChanLayerDecayRelease(SequenceChannelLayer* seqLayer, s32 target) note->playbackState.unk_04 = 1; note->playbackState.adsr.action.s.decay = 1; if (seqLayer->adsr.releaseRate == 0) { - note->playbackState.adsr.fadeOutVel = D_801726A0[seqLayer->seqChannel->adsr.releaseRate]; + note->playbackState.adsr.fadeOutVel = gAudioContext.unk_3520[seqLayer->seqChannel->adsr.releaseRate]; } else { - note->playbackState.adsr.fadeOutVel = D_801726A0[seqLayer->adsr.releaseRate]; + note->playbackState.adsr.fadeOutVel = gAudioContext.unk_3520[seqLayer->adsr.releaseRate]; } note->playbackState.adsr.sustain = ((f32)(s32)(seqLayer->seqChannel->adsr.sustain) * note->playbackState.adsr.current) / 256.0f; @@ -754,7 +754,7 @@ void Audio_NoteInitForLayer(Note* note, SequenceChannelLayer* seqLayer) { note->playbackState.parentLayer = seqLayer; playback->priority = seqLayer->seqChannel->notePriority; seqLayer->notePropertiesNeedInit = 1; - seqLayer->unusedEu0b8 = 1; + seqLayer->bit3 = 1; seqLayer->note = note; seqLayer->seqChannel->noteUnused = note; seqLayer->seqChannel->layerUnused = seqLayer; @@ -906,7 +906,7 @@ Note* Audio_AllocNote(SequenceChannelLayer* seqLayer) { return ret; null_return: - seqLayer->unusedEu0b8 = 1; + seqLayer->bit3 = 1; return NULL; } @@ -931,6 +931,6 @@ void Audio_NoteInitAll(void) { note->portamento.speed = 0; note->playbackState.stereoHeadsetEffects = 0; note->unk_BC = 0; - note->synthesisState.synthesisBuffers = Audio_SoundAlloc(&gAudioContext.gNotesAndBuffersPool, 0x1E0); + note->synthesisState.synthesisBuffers = Audio_AllocDmaMemory(&gAudioContext.gNotesAndBuffersPool, 0x1E0); } } diff --git a/src/code/audio_seqplayer.c b/src/code/audio_seqplayer.c index 2cc3d6e9c6..da5a2ff5c9 100644 --- a/src/code/audio_seqplayer.c +++ b/src/code/audio_seqplayer.c @@ -1,74 +1,1076 @@ #include #include -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800E9340.s") +#define PORTAMENTO_IS_SPECIAL(x) ((x).mode & 0x80) +#define PORTAMENTO_MODE(x) ((x).mode & ~0x80) +#define PORTAMENTO_MODE_1 1 +#define PORTAMENTO_MODE_2 2 +#define PORTAMENTO_MODE_3 3 +#define PORTAMENTO_MODE_4 4 +#define PORTAMENTO_MODE_5 5 -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800E93A8.s") +extern u8 D_80130470[]; -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800E9584.s") +u8 Audio_M64ReadU8(M64ScriptState* state); -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800E96D8.s") +s16 Audio_M64ReadS16(M64ScriptState* state); -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800E97FC.s") +u16 Audio_M64ReadCompressedU16(M64ScriptState* state); -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800E9878.s") +u8 Audio_GetInstrument(SequenceChannel* seqChannel, u8 instId, Instrument** instOut, AdsrSettings* adsr); -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/Audio_SequenceChannelDisable.s") +u16 Audio_GetScriptControlFlowArgument(M64ScriptState* state, u8 arg1) { + u8 temp_v0 = D_80130470[arg1]; + u8 loBits = temp_v0 & 3; + u16 ret = 0; + if (loBits == 1) { + if ((temp_v0 & 0x80) == 0) { + ret = Audio_M64ReadU8(state); + } else { + ret = Audio_M64ReadS16(state); + } + } + return ret; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800E9934.s") +s32 Audio_HandleScriptFlowControl(SequencePlayer* seqPlayer, M64ScriptState* state, s32 cmd, s32 arg) { + switch (cmd) { + case 0xFF: + if (state->depth == 0) { + return -1; + } + state->pc = state->stack[--state->depth]; + break; -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800E9A2C.s") + case 0xFD: + return Audio_M64ReadCompressedU16(state); -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800E9AAC.s") + case 0xFE: + return 1; -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800E9B44.s") + case 0xFC: + state->stack[state->depth++] = state->pc; + state->pc = seqPlayer->seqData + (u16)arg; + break; -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/Audio_SequencePlayerDisable.s") + case 0xF8: + state->remLoopIters[state->depth] = arg; + state->stack[state->depth++] = state->pc; + break; -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/Audio_AudioListPushBack.s") + case 0xF7: + state->remLoopIters[state->depth - 1]--; + if (state->remLoopIters[state->depth - 1] != 0) { + state->pc = state->stack[state->depth - 1]; + } else { + state->depth--; + } + break; -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/Audio_AudioListPopBack.s") + case 0xF6: + state->depth--; + break; -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800E9CA8.s") + case 0xF5: + case 0xF9: + case 0xFA: + case 0xFB: + if (cmd == 0xFA && state->value != 0) { + break; + } + if (cmd == 0xF9 && state->value >= 0) { + break; + } + if (cmd == 0xF5 && state->value < 0) { + break; + } + state->pc = seqPlayer->seqData + (u16)arg; + break; -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800E9D48.s") + case 0xF2: + case 0xF3: + case 0xF4: + if (cmd == 0xF3 && state->value != 0) { + break; + } + if (cmd == 0xF2 && state->value >= 0) { + break; + } + state->pc += (s8)(arg & 0xFF); + break; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800E9D5C.s") + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800E9D94.s") +void Audio_SequenceChannelInit(SequenceChannel* seqChannel) { + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800E9DD4.s") + if (seqChannel == &gAudioContext.gSequenceChannelNone) { + return; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800E9ED8.s") + seqChannel->enabled = 0; + seqChannel->finished = 0; + seqChannel->stopScript = 0; + seqChannel->stopSomething2 = 0; + seqChannel->hasInstrument = 0; + seqChannel->stereoHeadsetEffects = 0; + seqChannel->transposition = 0; + seqChannel->largeNotes = 0; + seqChannel->bookOffset = 0; + seqChannel->reverbBits.asByte = 0; + seqChannel->changes.asByte = 0xff; + seqChannel->scriptState.depth = 0; + seqChannel->newPan = 0x40; + seqChannel->panChannelWeight = 0x80; + seqChannel->velocityRandomVariance = 0; + seqChannel->durationRandomVariance = 0; + seqChannel->noteUnused = NULL; + seqChannel->reverbIndex = 0; + seqChannel->reverb = 0; + seqChannel->unk_0C = 0; + seqChannel->notePriority = 3; + seqChannel->someOtherPriority = 1; + seqChannel->delay = 0; + seqChannel->adsr.envelope = gDefaultEnvelope; + seqChannel->adsr.releaseRate = 0xf0; + seqChannel->adsr.sustain = 0; + seqChannel->vibratoRateTarget = 0x800; + seqChannel->vibratoRateStart = 0x800; + seqChannel->vibratoExtentTarget = 0; + seqChannel->vibratoExtentStart = 0; + seqChannel->vibratoRateChangeDelay = 0; + seqChannel->vibratoExtentChangeDelay = 0; + seqChannel->vibratoDelay = 0; + seqChannel->unk_CC = NULL; + seqChannel->unk_20 = 0; + seqChannel->unk_0F = 0; + seqChannel->volume = 1.0f; + seqChannel->volumeScale = 1.0f; + seqChannel->freqScale = 1.0f; -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800E9F64.s") + for (i = 0; i < 8; i++) { + seqChannel->soundScriptIO[i] = -1; + } -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800EA0C0.s") + seqChannel->unused = 0; + Audio_InitNoteLists(&seqChannel->notePool); +} -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800EA440.s") +s32 Audio_SeqChannelSetLayer(SequenceChannel* seqChannel, s32 layerIdx) { + SequenceChannelLayer* layer; -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800EAAE0.s") + if (seqChannel->layers[layerIdx] == NULL) { + SequenceChannelLayer* layer; + layer = Audio_AudioListPopBack(&gAudioContext.gLayerFreeList); + seqChannel->layers[layerIdx] = layer; + if (layer == NULL) { + seqChannel->layers[layerIdx] = NULL; + return -1; + } + } else { + Audio_SeqChanLayerNoteDecay(seqChannel->layers[layerIdx]); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800EAEF4.s") + layer = seqChannel->layers[layerIdx]; + layer->seqChannel = seqChannel; + layer->adsr = seqChannel->adsr; + layer->adsr.releaseRate = 0; + layer->enabled = 1; + layer->finished = 0; + layer->stopSomething = 0; + layer->continuousNotes = 0; + layer->bit3 = 0; + layer->ignoreDrumPan = 0; + layer->bit1 = 0; + layer->notePropertiesNeedInit = 0; + layer->reverbBits.asByte = 0; + layer->portamento.mode = 0; + layer->scriptState.depth = 0; + layer->noteDuration = 0x80; + layer->pan = 0x40; + layer->transposition = 0; + layer->delay = 0; + layer->duration = 0; + layer->delay2 = 0; + layer->note = NULL; + layer->instrument = NULL; + layer->freqScale = 1.0f; + layer->unk_34 = 1.0f; + layer->velocitySquare2 = 0.0f; + layer->instOrWave = 0xff; + return 0; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800EAF24.s") +void Audio_SeqChannelLayerDisable(SequenceChannelLayer* layer) { + if (layer != NULL) { + if (layer->seqChannel != &gAudioContext.gSequenceChannelNone && layer->seqChannel->seqPlayer->finished == 1) { + Audio_SeqChanLayerNoteRelease(layer); + } else { + Audio_SeqChanLayerNoteDecay(layer); + } + layer->enabled = 0; + layer->finished = 1; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800EAF98.s") +void Audio_SeqChannelLayerFree(SequenceChannel* seqChannel, s32 layerIdx) { + SequenceChannelLayer* layer = seqChannel->layers[layerIdx]; -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800EB044.s") + if (layer != NULL) { + Audio_AudioListPushBack(&gAudioContext.gLayerFreeList, &layer->listItem); + Audio_SeqChannelLayerDisable(layer); + seqChannel->layers[layerIdx] = NULL; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800EB068.s") +void Audio_SequenceChannelDisable(SequenceChannel* seqChannel) { + s32 i; + for (i = 0; i < 4; i++) { + Audio_SeqChannelLayerFree(seqChannel, i); + } -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800EBD58.s") + Audio_NotePoolClear(&seqChannel->notePool); + seqChannel->enabled = 0; + seqChannel->finished = 1; +} -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800EC564.s") +void Audio_SequencePlayerInitChannels(SequencePlayer* seqPlayer, u16 channelBits) { + SequenceChannel* seqChannel; + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800EC618.s") + for (i = 0; i < 0x10; i++) { + if (channelBits & 1) { + seqChannel = seqPlayer->channels[i]; + seqChannel->bankId = seqPlayer->defaultBank; + seqChannel->muteBehavior = seqPlayer->muteBehavior; + seqChannel->noteAllocPolicy = seqPlayer->noteAllocPolicy; + } + channelBits = channelBits >> 1; + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800EC668.s") +void Audio_SequencePlayerDisableChannels(SequencePlayer* seqPlayer, u16 channelBitsUnused) { + SequenceChannel* seqChannel; + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800EC734.s") + for (i = 0; i < 0x10; i++) { + seqChannel = seqPlayer->channels[i]; + if (IS_SEQUENCE_CHANNEL_VALID(seqChannel) == 1) { + Audio_SequenceChannelDisable(seqChannel); + } + } +} -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800EC80C.s") +void Audio_SequenceChannelEnable(SequencePlayer* seqPlayer, u8 channelIdx, void* script) { + SequenceChannel* seqChannel = seqPlayer->channels[channelIdx]; + s32 i; -#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/func_800EC8DC.s") + seqChannel->enabled = 1; + seqChannel->finished = 0; + seqChannel->scriptState.depth = 0; + seqChannel->scriptState.pc = script; + seqChannel->delay = 0; + for (i = 0; i < 4; i++) { + if (seqChannel->layers[i] != NULL) { + Audio_SeqChannelLayerFree(seqChannel, i); + } + } +} + +void Audio_SequencePlayerDisableAsFinished(SequencePlayer* seqPlayer) { + seqPlayer->finished = 1; + Audio_SequencePlayerDisable(seqPlayer); +} + +void Audio_SequencePlayerDisable(SequencePlayer* seqPlayer) { + Audio_SequencePlayerDisableChannels(seqPlayer, 0xffff); + Audio_NotePoolClear(&seqPlayer->notePool); + if (!seqPlayer->enabled) { + return; + } + seqPlayer->enabled = 0; + seqPlayer->finished = 1; + + if (Audio_IsSeqLoadComplete(seqPlayer->seqId)) { + Audio_SetSeqLoadStatus(seqPlayer->seqId, 3); + } + if (Audio_IsBankLoadComplete(seqPlayer->defaultBank)) { + 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; + } +} + +void Audio_AudioListPushBack(AudioListItem* list, AudioListItem* item) { + if (item->prev == NULL) { + list->prev->next = item; + item->prev = list->prev; + item->next = list; + list->prev = item; + list->u.count++; + item->pool = list->pool; + } +} + +void* Audio_AudioListPopBack(AudioListItem* list) { + AudioListItem* item = list->prev; + if (item == list) { + return NULL; + } + item->prev->next = list; + list->prev = item->prev; + item->prev = NULL; + list->u.count--; + return item->u.value; +} + +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; + + 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); + } +} + +u8 Audio_M64ReadU8(M64ScriptState* state) { + return *(state->pc++); +} + +s16 Audio_M64ReadS16(M64ScriptState* state) { + s16 ret = *(state->pc++) << 8; + ret = *(state->pc++) | ret; + return ret; +} + +u16 Audio_M64ReadCompressedU16(M64ScriptState* state) { + u16 ret = *(state->pc++); + if (ret & 0x80) { + ret = (ret << 8) & 0x7f00; + ret = *(state->pc++) | ret; + } + return ret; +} + +void func_800E9ED8(SequenceChannelLayer* layer); +s32 func_800E9F64(SequenceChannelLayer* layer, s32 arg1); +s32 func_800EA0C0(SequenceChannelLayer* layer); +s32 func_800EA440(SequenceChannelLayer* layer, s32 arg1); +s32 func_800EAAE0(SequenceChannelLayer* layer, s32 arg1); + +void Audio_SeqChannelLayerProcessScript(SequenceChannelLayer* layer) { + s32 val; + + if (layer->enabled == 0) { + return; + } + + if (layer->delay > 1) { + layer->delay--; + if (!layer->stopSomething && layer->delay <= layer->duration) { + Audio_SeqChanLayerNoteDecay(layer); + layer->stopSomething = 1; + } + return; + } + + func_800E9ED8(layer); + val = func_800EA0C0(layer); + if (val == -1) { + return; + } + + val = func_800EAAE0(layer, val); + if (val != -1) { + val = func_800EA440(layer, val); + } + if (val != -1) { + func_800E9F64(layer, val); + } + + if (layer->stopSomething == 1) { + if ((layer->note != NULL) || layer->continuousNotes) { + Audio_SeqChanLayerNoteDecay(layer); + } + } +} + +void func_800E9ED8(SequenceChannelLayer* layer) { + if (!layer->continuousNotes) { + Audio_SeqChanLayerNoteDecay(layer); + } else if (layer->note != NULL && layer->note->playbackState.wantedParentLayer == layer) { + Audio_SeqChanLayerNoteDecay(layer); + } + + if (PORTAMENTO_MODE(layer->portamento) == PORTAMENTO_MODE_1 || + PORTAMENTO_MODE(layer->portamento) == PORTAMENTO_MODE_2) { + layer->portamento.mode = 0; + } + layer->notePropertiesNeedInit = 1; +} + +s32 func_800E9F64(SequenceChannelLayer* layer, s32 arg1) { + if (!layer->stopSomething && layer->sound != NULL && layer->sound->sample->bits4 == 2 && + layer->sound->sample->bits2 != 0) { + layer->stopSomething = 1; + return -1; + } + + if (layer->continuousNotes == 1 && layer->bit1 == 1) { + return 0; + } + + if (layer->continuousNotes == 1 && layer->note != NULL && layer->bit3 && arg1 == 1 && + layer->note->playbackState.parentLayer == layer) { + if (layer->sound == NULL) { + Audio_InitSyntheticWave(layer->note, layer); + } + } else { + if (arg1 == 0) { + Audio_SeqChanLayerNoteDecay(layer); + } + layer->note = Audio_AllocNote(layer); + if (layer->note != NULL && layer->note->playbackState.parentLayer == layer) { + Audio_NoteVibratoInit(layer->note); + } + } + + if (layer->note != NULL && layer->note->playbackState.parentLayer == layer) { + Note* note = layer->note; + Audio_NotePortamentoInit(note); + } + return 0; +} + +s32 func_800EA0C0(SequenceChannelLayer* layer) { + SequenceChannel* seqChannel = layer->seqChannel; + M64ScriptState* state = &layer->scriptState; + SequencePlayer* seqPlayer = seqChannel->seqPlayer; + u16 sp3A; + u8 cmd; + + for (;;) { + cmd = Audio_M64ReadU8(state); + if (cmd < 0xC1) { + return cmd; + } + if (cmd >= 0xF2) { + u16 arg = Audio_GetScriptControlFlowArgument(state, cmd); + if (Audio_HandleScriptFlowControl(seqPlayer, state, cmd, arg) == 0) { + continue; + } + Audio_SeqChannelLayerDisable(layer); + return -1; + } + + switch (cmd) { + case 0xC1: // layer_setshortnotevelocity + case 0xCA: // layer_setpan + { + u8 tempByte = *(state->pc++); + if (cmd == 0xC1) { + layer->velocitySquare = (f32)(tempByte * tempByte) / 16129.0f; + } else { + layer->pan = tempByte; + } + break; + } + + case 0xC9: // layer_setshortnoteduration + case 0xC2: // layer_transpose; set transposition in semitones + { + u8 tempByte = *(state->pc++); + if (cmd == 0xC9) { + layer->noteDuration = tempByte; + } else { + layer->transposition = tempByte; + } + break; + } + + case 0xC4: // layer_continuousnoteson + case 0xC5: // layer_continuousnotesoff + if (cmd == 0xC4) { + layer->continuousNotes = 1; + } else { + layer->continuousNotes = 0; + } + layer->bit1 = 0; + Audio_SeqChanLayerNoteDecay(layer); + break; + + case 0xC3: // layer_setshortnotedefaultplaypercentage + sp3A = Audio_M64ReadCompressedU16(state); + layer->shortNoteDefaultPlayPercentage = sp3A; + break; + + case 0xC6: // layer_setinstr + cmd = Audio_M64ReadU8(state); + if (cmd >= 0x7E) { + if (cmd == 0x7E) { + layer->instOrWave = 1; + } else if (cmd == 0x7F) { + layer->instOrWave = 0; + } else { + layer->instOrWave = cmd; + layer->instrument = NULL; + } + + if (cmd == 0xFF) { + layer->adsr.releaseRate = 0; + } + + break; + } + + if ((layer->instOrWave = Audio_GetInstrument(seqChannel, cmd, &layer->instrument, &layer->adsr)) == 0) { + layer->instOrWave = 0xFF; + } + break; + + case 0xC7: // layer_portamento + layer->portamento.mode = Audio_M64ReadU8(state); + + cmd = Audio_M64ReadU8(state); + cmd += seqChannel->transposition; + cmd += layer->transposition; + cmd += seqPlayer->transposition; + + if (cmd >= 0x80) { + cmd = 0; + } + + layer->portamentoTargetNote = cmd; + + // If special, the next param is u8 instead of var + if (PORTAMENTO_IS_SPECIAL(layer->portamento)) { + layer->portamentoTime = *(state->pc++); + break; + } + + sp3A = Audio_M64ReadCompressedU16(state); + layer->portamentoTime = sp3A; + break; + + case 0xC8: // layer_disableportamento + layer->portamento.mode = 0; + break; + + case 0xCB: + sp3A = Audio_M64ReadS16(state); + layer->adsr.envelope = (AdsrEnvelope*)(seqPlayer->seqData + sp3A); + // fallthrough + + case 0xCF: + layer->adsr.releaseRate = Audio_M64ReadU8(state); + break; + + case 0xCC: + layer->ignoreDrumPan = 1; + break; + + case 0xCD: + layer->reverbBits.asByte = Audio_M64ReadU8(state); + break; + + case 0xCE: { + u8 tempByte = Audio_M64ReadU8(state); + layer->unk_34 = D_8012F4B4[(tempByte + 0x80) & 0xFF]; + break; + } + + default: + switch (cmd & 0xF0) { + case 0xD0: // layer_setshortnotevelocityfromtable + sp3A = seqPlayer->shortNoteVelocityTable[cmd & 0xF]; + layer->velocitySquare = (f32)(sp3A * sp3A) / 16129.0f; + break; + case 0xE0: // layer_setshortnotedurationfromtable + layer->noteDuration = (u8)seqPlayer->shortNoteDurationTable[cmd & 0xF]; + break; + } + } + } +} + +s32 func_800EA440(SequenceChannelLayer* layer, s32 arg1) { + s32 sameSound; + s32 instOrWave; + s32 speed; + f32 temp_f14; + f32 temp_f2; + Portamento* portamento; + f32 freqScale; + f32 freqScale2; + AudioBankSound* sound; + Instrument* instrument; + Drum* drum; + AudioBankSound* unkInstrument; + SequenceChannel* seqChannel; + SequencePlayer* seqPlayer; + u8 cmd; + u16 unkInstrumentId; + s32 cmd2; + s32 vel; + f32 time; + f32 tuning; + + sameSound = 1; + cmd = arg1; + + instOrWave = layer->instOrWave; + seqChannel = layer->seqChannel; + seqPlayer = seqChannel->seqPlayer; + + if (instOrWave == 0xFF) { + if (!seqChannel->hasInstrument) { + return -1; + } + instOrWave = seqChannel->instOrWave; + } + + switch (instOrWave) { + case 0: + cmd += seqChannel->transposition + layer->transposition; + layer->semitone = cmd; + drum = Audio_GetDrum(seqChannel->bankId, cmd); + if (drum == NULL) { + layer->stopSomething = 1; + layer->delay2 = layer->delay; + return -1; + } + sound = &drum->sound; + layer->adsr.envelope = (AdsrEnvelope*)drum->envelope; + layer->adsr.releaseRate = (u8)drum->releaseRate; + if (!layer->ignoreDrumPan) { + layer->pan = drum->pan; + } + layer->sound = sound; + layer->freqScale = sound->tuning; + break; + + case 1: + layer->semitone = cmd; + unkInstrumentId = (layer->transposition << 6) + cmd; + sound = (AudioBankSound*)Audio_GetUnkInstrument(seqChannel->bankId, unkInstrumentId); + if (sound == NULL) { + layer->stopSomething = 1; + layer->delay2 = layer->delay + 1; + return -1; + } + layer->sound = sound; + layer->freqScale = sound->tuning; + break; + + default: + cmd += seqPlayer->transposition + seqChannel->transposition + layer->transposition; + cmd2 = cmd; + layer->semitone = cmd; + if (cmd >= 0x80) { + layer->stopSomething = 1; + return -1; + } + if (layer->instOrWave == 0xFF) { + instrument = seqChannel->instrument; + } else { + instrument = layer->instrument; + } + + if (layer->portamento.mode != 0) { + portamento = &layer->portamento; + vel = (cmd > layer->portamentoTargetNote) ? cmd : layer->portamentoTargetNote; + + if (instrument != NULL) { + sound = Audio_InstrumentGetAudioBankSound(instrument, vel); + sameSound = (layer->sound == sound); + layer->sound = sound; + tuning = sound->tuning; + } else { + layer->sound = NULL; + tuning = 1.0f; + if (instOrWave >= 0xC0) { + layer->sound = &gAudioContext.largeSounds[instOrWave - 0xC0].sound; + } + } + + temp_f2 = gNoteFrequencies[cmd2] * tuning; + temp_f14 = gNoteFrequencies[layer->portamentoTargetNote] * tuning; + + switch (PORTAMENTO_MODE(*portamento)) { + case PORTAMENTO_MODE_1: + case PORTAMENTO_MODE_3: + case PORTAMENTO_MODE_5: + freqScale2 = temp_f2; + freqScale = temp_f14; + break; + case PORTAMENTO_MODE_2: + case PORTAMENTO_MODE_4: + freqScale = temp_f2; + freqScale2 = temp_f14; + break; + default: + freqScale = temp_f2; + freqScale2 = temp_f2; + break; + } + + portamento->extent = (freqScale2 / freqScale) - 1.0f; + + if (PORTAMENTO_IS_SPECIAL(*portamento)) { + speed = seqPlayer->tempo * 0x8000 / gAudioContext.unk_2898; + if (layer->delay != 0) { + speed = speed * 0x100 / (layer->delay * layer->portamentoTime); + } + } else { + speed = 0x20000 / (layer->portamentoTime * gAudioContext.gAudioBufferParameters.unk_08); + } + + if (speed >= 0x7FFF) { + speed = 0x7FFF; + } else if (speed < 1) { + speed = 1; + } + + portamento->speed = speed; + portamento->cur = 0; + layer->freqScale = freqScale; + if (PORTAMENTO_MODE(*portamento) == PORTAMENTO_MODE_5) { + layer->portamentoTargetNote = cmd; + } + break; + } + + if (instrument != NULL) { + sound = Audio_InstrumentGetAudioBankSound(instrument, cmd); + sameSound = (sound == layer->sound); + layer->sound = sound; + layer->freqScale = gNoteFrequencies[cmd2] * sound->tuning; + } else { + layer->sound = NULL; + layer->freqScale = gNoteFrequencies[cmd2]; + if (instOrWave >= 0xC0) { + layer->sound = &gAudioContext.largeSounds[instOrWave - 0xC0].sound; + } + } + break; + } + + layer->delay2 = layer->delay; + layer->freqScale *= layer->unk_34; + if (layer->delay == 0) { + if (layer->sound != NULL) { + time = (f32)layer->sound->sample->loop->end; + } else { + time = 0.0f; + } + time *= seqPlayer->tempo; + time *= gAudioContext.unk_2870; + time /= layer->freqScale; + if (time > 32766.0f) { + time = 32766.0f; + } + layer->duration = 0; + layer->delay = (u16)(s32)time + 1; + if (layer->portamento.mode != 0) { + // (It's a bit unclear if 'portamento' has actually always been + // set when this is reached...) + if (PORTAMENTO_IS_SPECIAL(*portamento)) { + s32 speed2; + speed2 = seqPlayer->tempo * 0x8000 / gAudioContext.unk_2898; + speed2 = speed2 * 0x100 / (layer->delay * layer->portamentoTime); + if (speed2 >= 0x7FFF) { + speed2 = 0x7FFF; + } else if (speed2 < 1) { + speed2 = 1; + } + portamento->speed = speed2; + } + } + } + return sameSound; +} + +s32 func_800EAAE0(SequenceChannelLayer* layer, s32 arg1) { + M64ScriptState* state; + u16 playPercentage; + s32 velocity; + SequenceChannel* seqChannel; + SequencePlayer* seqPlayer; + s32 intDelta; + f32 floatDelta; + + state = &layer->scriptState; + seqChannel = layer->seqChannel; + seqPlayer = seqChannel->seqPlayer; + + if (arg1 == 0xC0) { + layer->delay = Audio_M64ReadCompressedU16(state); + layer->stopSomething = 1; + layer->bit1 = 0; + return -1; + } + + layer->stopSomething = 0; + if (seqChannel->largeNotes == 1) { + switch (arg1 & 0xC0) { + case 0: + playPercentage = Audio_M64ReadCompressedU16(state); + velocity = *(state->pc++); + layer->noteDuration = *(state->pc++); + layer->playPercentage = playPercentage; + break; + + case 0x40: + playPercentage = Audio_M64ReadCompressedU16(state); + velocity = *(state->pc++); + layer->noteDuration = 0; + layer->playPercentage = playPercentage; + break; + + case 0x80: + playPercentage = layer->playPercentage; + velocity = *(state->pc++); + layer->noteDuration = *(state->pc++); + break; + } + + if (velocity > 0x7F || velocity < 0) { + velocity = 0x7F; + } + layer->velocitySquare = (f32)velocity * (f32)velocity / 16129.0f; + arg1 -= (arg1 & 0xC0); + } else { + switch (arg1 & 0xC0) { + case 0: + playPercentage = Audio_M64ReadCompressedU16(state); + layer->playPercentage = playPercentage; + break; + + case 0x40: + playPercentage = layer->shortNoteDefaultPlayPercentage; + break; + + case 0x80: + playPercentage = layer->playPercentage; + break; + } + arg1 -= (arg1 & 0xC0); + } + + if (seqChannel->velocityRandomVariance != 0) { + floatDelta = + layer->velocitySquare * (f32)(gAudioContext.gAudioRandom % seqChannel->velocityRandomVariance) / 100.0f; + if ((gAudioContext.gAudioRandom & 0x8000) != 0) { + floatDelta = -floatDelta; + } + layer->velocitySquare2 = layer->velocitySquare + floatDelta; + if (layer->velocitySquare2 < 0.0f) { + layer->velocitySquare2 = 0.0f; + } else if (layer->velocitySquare2 > 1.0f) { + layer->velocitySquare2 = 1.0f; + } + } else { + layer->velocitySquare2 = layer->velocitySquare; + } + + layer->delay = playPercentage; + 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 = -intDelta; + } + layer->duration += intDelta; + if (layer->duration < 0) { + layer->duration = 0; + } else if (layer->duration > layer->delay) { + layer->duration = layer->delay; + } + } + + if ((seqPlayer->muted && (seqChannel->muteBehavior & (0x40 | 0x10)) != 0) || seqChannel->stopSomething2) { + layer->stopSomething = 1; + return -1; + } + if (seqPlayer->unk_DC != 0) { + layer->stopSomething = 1; + return -1; + } + return arg1; +} + +void func_800EAEF4(SequenceChannel* seqChannel, u8 arg1) { + if ((arg1 & 0xF) != 0) { + seqChannel->notePriority = arg1 & 0xF; + } + arg1 = arg1 >> 4; + if (arg1 != 0) { + seqChannel->someOtherPriority = arg1; + } +} + +u8 Audio_GetInstrument(SequenceChannel* seqChannel, u8 instId, Instrument** instOut, AdsrSettings* adsr) { + Instrument* inst = Audio_GetInstrumentInner(seqChannel->bankId, instId); + if (inst == NULL) { + *instOut = NULL; + return 0; + } + adsr->envelope = inst->envelope; + adsr->releaseRate = inst->releaseRate; + *instOut = inst; + instId += 2; + return instId; +} + +void Audio_SetInstrument(SequenceChannel* seqChannel, u8 instId) { + if (instId >= 0x80) { + seqChannel->instOrWave = instId; + seqChannel->instrument = NULL; + } else if (instId == 0x7F) { + seqChannel->instOrWave = 0; + seqChannel->instrument = (Instrument*)1; + } else if (instId == 0x7E) { + seqChannel->instOrWave = 1; + seqChannel->instrument = (Instrument*)2; + } else if ((seqChannel->instOrWave = + Audio_GetInstrument(seqChannel, instId, &seqChannel->instrument, &seqChannel->adsr)) == 0) { + seqChannel->hasInstrument = 0; + return; + } + seqChannel->hasInstrument = 1; +} + +void Audio_SequenceChannelSetVolume(SequenceChannel* seqChannel, u8 volume) { + seqChannel->volume = (f32)(s32)volume / 127.0f; +} + +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/Audio_SequenceChannelProcessScript.s") + +void Audio_SequenceChannelProcessScript(SequenceChannel* seqChannel); + +#pragma GLOBAL_ASM("asm/non_matchings/code/audio_seqplayer/Audio_SequencePlayerProcessSequence.s") + +void Audio_SequencePlayerProcessSequence(SequencePlayer* seqPlayer); + +void Audio_ProcessSequences(s32 arg0) { + SequencePlayer* seqPlayer; + u32 i; + + gAudioContext.gNoteSubEuOffset = + (gAudioContext.gAudioBufferParameters.unk_08 - arg0 - 1) * gAudioContext.gMaxSimultaneousNotes; + for (i = 0; i < (u32)gAudioContext.gAudioBufferParameters.unk_10; i++) { + seqPlayer = &gAudioContext.gSequencePlayers[i]; + if (seqPlayer->enabled == 1) { + Audio_SequencePlayerProcessSequence(seqPlayer); + Audio_SequencePlayerProcessSound(seqPlayer); + } + } + Audio_ProcessNotes(); +} + +void Audio_ProcessSequence(SequencePlayer* seqPlayer) { + while (seqPlayer->unk_DC > 0) { + Audio_SequencePlayerProcessSequence(seqPlayer); + Audio_SequencePlayerProcessSound(seqPlayer); + seqPlayer->unk_DC--; + } +} + +void Audio_ResetSequencePlayer(SequencePlayer* seqPlayer) { + s32 i; + + Audio_SequencePlayerDisable(seqPlayer); + seqPlayer->unk_0b2 = 0; + seqPlayer->delay = 0; + seqPlayer->state = 1; + seqPlayer->fadeTimer = 0; + seqPlayer->fadeTimerUnkEu = 0; + seqPlayer->tempoAcc = 0; + seqPlayer->tempo = 120 * TATUMS_PER_BEAT; // 120 BPM + seqPlayer->unk_0C = 0; + seqPlayer->transposition = 0; + seqPlayer->noteAllocPolicy = 0; + seqPlayer->shortNoteVelocityTable = gDefaultShortNoteVelocityTable; + seqPlayer->shortNoteDurationTable = gDefaultShortNoteDurationTable; + seqPlayer->unk_E0 = 0; + seqPlayer->fadeVolume = 1.0f; + seqPlayer->fadeVelocity = 0.0f; + seqPlayer->volume = 0.0f; + seqPlayer->muteVolumeScale = 0.5f; + + for (i = 0; i < 0x10; i++) { + Audio_SequenceChannelInit(seqPlayer->channels[i]); + } +} + +void func_800EC734(s32 seqPlayerIdx) { + SequenceChannel* seqChannel; + SequencePlayer* seqPlayer; + s32 i, j; + + seqPlayer = &gAudioContext.gSequencePlayers[seqPlayerIdx]; + for (i = 0; i < 0x10; i++) { + seqPlayer->channels[i] = Audio_AllocZeroed(&gAudioContext.gNotesAndBuffersPool, sizeof(SequenceChannel)); + if (seqPlayer->channels[i] == NULL) { + seqPlayer->channels[i] = &gAudioContext.gSequenceChannelNone; + } else { + seqChannel = seqPlayer->channels[i]; + seqChannel->seqPlayer = seqPlayer; + seqChannel->enabled = 0; + for (j = 0; j < 4; j++) { + seqChannel->layers[j] = NULL; + } + } + Audio_SequenceChannelInit(seqPlayer->channels[i]); + } +} + +void Audio_InitSequencePlayer(SequencePlayer* seqPlayer) { + s32 i, j; + + for (i = 0; i < 0x10; i++) { + seqPlayer->channels[i] = &gAudioContext.gSequenceChannelNone; + } + + seqPlayer->enabled = 0; + seqPlayer->muted = 0; + seqPlayer->bankDmaInProgress = 0; + seqPlayer->seqDmaInProgress = 0; + seqPlayer->unk_0b1 = 0; + + for (j = 0; j < 8; j++) { + seqPlayer->unk_158[j] = -1; + } + seqPlayer->muteBehavior = 0x40 | 0x20; + seqPlayer->fadeVolumeScale = 1.0f; + seqPlayer->unk_34 = 1.0f; + Audio_InitNoteLists(&seqPlayer->notePool); + Audio_ResetSequencePlayer(seqPlayer); +} + +void Audio_InitSequencePlayers(void) { + s32 i; + + Audio_InitLayerFreelist(); + for (i = 0; i < 64; i++) { + gAudioContext.gSequenceLayers[i].seqChannel = NULL; + gAudioContext.gSequenceLayers[i].enabled = 0; + } + + for (i = 0; i < 4; i++) { + Audio_InitSequencePlayer(&gAudioContext.gSequencePlayers[i]); + } +} diff --git a/src/code/code_800E11F0.c b/src/code/code_800E11F0.c index d89413ed5b..0cf0be4fac 100644 --- a/src/code/code_800E11F0.c +++ b/src/code/code_800E11F0.c @@ -9,15 +9,15 @@ #pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E1618.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E18B0.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/Audio_IsBankLoadComplete.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E1928.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/func_800E1A18.s") +#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/Audio_SetBankLoadStatus.s") -#pragma GLOBAL_ASM("asm/non_matchings/code/code_800E11F0/func_800E1A48.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")