diff --git a/asm/non_matchings/unknown_001050/func_80000450.s b/asm/non_matchings/unknown_001050/func_80000450.s deleted file mode 100644 index ac1fb332..00000000 --- a/asm/non_matchings/unknown_001050/func_80000450.s +++ /dev/null @@ -1,278 +0,0 @@ -glabel func_80000450 -/* 001050 80000450 27BDFF68 */ addiu $sp, $sp, -0x98 -/* 001054 80000454 AFA40098 */ sw $a0, 0x98($sp) -/* 001058 80000458 AFBF002C */ sw $ra, 0x2c($sp) -/* 00105C 8000045C AFB10024 */ sw $s1, 0x24($sp) -/* 001060 80000460 3C048011 */ lui $a0, %hi(gALHeap) # $a0, 0x8011 -/* 001064 80000464 3C05800F */ lui $a1, %hi(D_800EBF60) # $a1, 0x800f -/* 001068 80000468 3C060002 */ lui $a2, (0x00029D88 >> 16) # lui $a2, 2 -/* 00106C 8000046C AFB20028 */ sw $s2, 0x28($sp) -/* 001070 80000470 AFB00020 */ sw $s0, 0x20($sp) -/* 001074 80000474 00008825 */ move $s1, $zero -/* 001078 80000478 34C69D88 */ ori $a2, (0x00029D88 & 0xFFFF) # ori $a2, $a2, 0x9d88 -/* 00107C 8000047C 24A5BF60 */ addiu $a1, %lo(D_800EBF60) # addiu $a1, $a1, -0x40a0 -/* 001080 80000480 0C031D58 */ jal alHeapInit -/* 001084 80000484 24845CE8 */ addiu $a0, %lo(gALHeap) # addiu $a0, $a0, 0x5ce8 -/* 001088 80000488 0C01DB16 */ jal func_80076C58 -/* 00108C 8000048C 24040026 */ li $a0, 38 -/* 001090 80000490 8C4E0008 */ lw $t6, 8($v0) -/* 001094 80000494 8C4F0004 */ lw $t7, 4($v0) -/* 001098 80000498 3C0500FF */ lui $a1, (0x00FFFFFF >> 16) # lui $a1, 0xff -/* 00109C 8000049C 00409025 */ move $s2, $v0 -/* 0010A0 800004A0 34A5FFFF */ ori $a1, (0x00FFFFFF & 0xFFFF) # ori $a1, $a1, 0xffff -/* 0010A4 800004A4 0C01C327 */ jal func_80070C9C -/* 0010A8 800004A8 01CF2023 */ subu $a0, $t6, $t7 -/* 0010AC 800004AC 3C108011 */ lui $s0, %hi(D_80115D14) # $s0, 0x8011 -/* 0010B0 800004B0 26105D14 */ addiu $s0, %lo(D_80115D14) # addiu $s0, $s0, 0x5d14 -/* 0010B4 800004B4 AE020000 */ sw $v0, ($s0) -/* 0010B8 800004B8 8E580008 */ lw $t8, 8($s2) -/* 0010BC 800004BC 8E460004 */ lw $a2, 4($s2) -/* 0010C0 800004C0 24040027 */ li $a0, 39 -/* 0010C4 800004C4 00402825 */ move $a1, $v0 -/* 0010C8 800004C8 0C01DB9A */ jal func_80076E68 -/* 0010CC 800004CC 03063823 */ subu $a3, $t8, $a2 -/* 0010D0 800004D0 8E450008 */ lw $a1, 8($s2) -/* 0010D4 800004D4 0C01DBBA */ jal func_80076EE8 -/* 0010D8 800004D8 24040027 */ li $a0, 39 -/* 0010DC 800004DC 8E040000 */ lw $a0, ($s0) -/* 0010E0 800004E0 0C031DA9 */ jal alBnkfNew -/* 0010E4 800004E4 00402825 */ move $a1, $v0 -/* 0010E8 800004E8 8E59001C */ lw $t9, 0x1c($s2) -/* 0010EC 800004EC 8E490018 */ lw $t1, 0x18($s2) -/* 0010F0 800004F0 3C108011 */ lui $s0, %hi(D_80115D28) # $s0, 0x8011 -/* 0010F4 800004F4 26105D28 */ addiu $s0, %lo(D_80115D28) # addiu $s0, $s0, 0x5d28 -/* 0010F8 800004F8 3C0500FF */ lui $a1, (0x00FFFFFF >> 16) # lui $a1, 0xff -/* 0010FC 800004FC 03292023 */ subu $a0, $t9, $t1 -/* 001100 80000500 AE040000 */ sw $a0, ($s0) -/* 001104 80000504 0C01C327 */ jal func_80070C9C -/* 001108 80000508 34A5FFFF */ ori $a1, (0x00FFFFFF & 0xFFFF) # ori $a1, $a1, 0xffff -/* 00110C 8000050C 3C038011 */ lui $v1, %hi(D_80115D18) # $v1, 0x8011 -/* 001110 80000510 24635D18 */ addiu $v1, %lo(D_80115D18) # addiu $v1, $v1, 0x5d18 -/* 001114 80000514 AC620000 */ sw $v0, ($v1) -/* 001118 80000518 8E460018 */ lw $a2, 0x18($s2) -/* 00111C 8000051C 8E070000 */ lw $a3, ($s0) -/* 001120 80000520 24040027 */ li $a0, 39 -/* 001124 80000524 0C01DB9A */ jal func_80076E68 -/* 001128 80000528 00402825 */ move $a1, $v0 -/* 00112C 8000052C 8E0B0000 */ lw $t3, ($s0) -/* 001130 80000530 2401000A */ li $at, 10 -/* 001134 80000534 0161001B */ divu $zero, $t3, $at -/* 001138 80000538 3C018011 */ lui $at, %hi(D_80115D20) # $at, 0x8011 -/* 00113C 8000053C 3C038011 */ lui $v1, %hi(D_80115D2C) # $v1, 0x8011 -/* 001140 80000540 24635D2C */ addiu $v1, %lo(D_80115D2C) # addiu $v1, $v1, 0x5d2c -/* 001144 80000544 3C0500FF */ lui $a1, (0x00FFFFFF >> 16) # lui $a1, 0xff -/* 001148 80000548 34A5FFFF */ ori $a1, (0x00FFFFFF & 0xFFFF) # ori $a1, $a1, 0xffff -/* 00114C 8000054C 00006012 */ mflo $t4 -/* 001150 80000550 AC2C5D20 */ sw $t4, %lo(D_80115D20)($at) -/* 001154 80000554 8E4E0014 */ lw $t6, 0x14($s2) -/* 001158 80000558 8E4D0018 */ lw $t5, 0x18($s2) -/* 00115C 8000055C 00000000 */ nop -/* 001160 80000560 01AE2023 */ subu $a0, $t5, $t6 -/* 001164 80000564 0C01C327 */ jal func_80070C9C -/* 001168 80000568 AC640000 */ sw $a0, ($v1) -/* 00116C 8000056C 3C038011 */ lui $v1, %hi(D_80115D1C) # $v1, 0x8011 -/* 001170 80000570 24635D1C */ addiu $v1, %lo(D_80115D1C) # addiu $v1, $v1, 0x5d1c -/* 001174 80000574 3C108011 */ lui $s0, %hi(D_80115D2C) # $s0, 0x8011 -/* 001178 80000578 26105D2C */ addiu $s0, %lo(D_80115D2C) # addiu $s0, $s0, 0x5d2c -/* 00117C 8000057C AC620000 */ sw $v0, ($v1) -/* 001180 80000580 8E460014 */ lw $a2, 0x14($s2) -/* 001184 80000584 8E070000 */ lw $a3, ($s0) -/* 001188 80000588 24040027 */ li $a0, 39 -/* 00118C 8000058C 0C01DB9A */ jal func_80076E68 -/* 001190 80000590 00402825 */ move $a1, $v0 -/* 001194 80000594 8E180000 */ lw $t8, ($s0) -/* 001198 80000598 24010003 */ li $at, 3 -/* 00119C 8000059C 0301001B */ divu $zero, $t8, $at -/* 0011A0 800005A0 3C018011 */ lui $at, %hi(D_80115D24) # $at, 0x8011 -/* 0011A4 800005A4 3C0500FF */ lui $a1, (0x00FFFFFF >> 16) # lui $a1, 0xff -/* 0011A8 800005A8 34A5FFFF */ ori $a1, (0x00FFFFFF & 0xFFFF) # ori $a1, $a1, 0xffff -/* 0011AC 800005AC 0000C812 */ mflo $t9 -/* 0011B0 800005B0 AC395D24 */ sw $t9, %lo(D_80115D24)($at) -/* 0011B4 800005B4 8E440000 */ lw $a0, ($s2) -/* 0011B8 800005B8 0C01C327 */ jal func_80070C9C -/* 0011BC 800005BC 00000000 */ nop -/* 0011C0 800005C0 3C108011 */ lui $s0, %hi(D_80115D10) # $s0, 0x8011 -/* 0011C4 800005C4 26105D10 */ addiu $s0, %lo(D_80115D10) # addiu $s0, $s0, 0x5d10 -/* 0011C8 800005C8 AE020000 */ sw $v0, ($s0) -/* 0011CC 800005CC 8E470000 */ lw $a3, ($s2) -/* 0011D0 800005D0 24040027 */ li $a0, 39 -/* 0011D4 800005D4 00402825 */ move $a1, $v0 -/* 0011D8 800005D8 0C01DB9A */ jal func_80076E68 -/* 0011DC 800005DC 00003025 */ move $a2, $zero -/* 0011E0 800005E0 8E450000 */ lw $a1, ($s2) -/* 0011E4 800005E4 0C01DBBA */ jal func_80076EE8 -/* 0011E8 800005E8 24040027 */ li $a0, 39 -/* 0011EC 800005EC 8E040000 */ lw $a0, ($s0) -/* 0011F0 800005F0 0C031DA9 */ jal alBnkfNew -/* 0011F4 800005F4 00402825 */ move $a1, $v0 -/* 0011F8 800005F8 3C068011 */ lui $a2, %hi(gALHeap) # $a2, 0x8011 -/* 0011FC 800005FC 24090004 */ li $t1, 4 -/* 001200 80000600 AFA90010 */ sw $t1, 0x10($sp) -/* 001204 80000604 24C65CE8 */ addiu $a2, %lo(gALHeap) # addiu $a2, $a2, 0x5ce8 -/* 001208 80000608 00002025 */ move $a0, $zero -/* 00120C 8000060C 00002825 */ move $a1, $zero -/* 001210 80000610 0C031DFC */ jal alHeapDBAlloc -/* 001214 80000614 24070001 */ li $a3, 1 -/* 001218 80000618 3C108011 */ lui $s0, %hi(D_80115CF8) # $s0, 0x8011 -/* 00121C 8000061C 26105CF8 */ addiu $s0, %lo(D_80115CF8) # addiu $s0, $s0, 0x5cf8 -/* 001220 80000620 AE020000 */ sw $v0, ($s0) -/* 001224 80000624 8E460010 */ lw $a2, 0x10($s2) -/* 001228 80000628 24040027 */ li $a0, 39 -/* 00122C 8000062C 00402825 */ move $a1, $v0 -/* 001230 80000630 0C01DB9A */ jal func_80076E68 -/* 001234 80000634 24070004 */ li $a3, 4 -/* 001238 80000638 8E0A0000 */ lw $t2, ($s0) -/* 00123C 8000063C 3C0500FF */ lui $a1, (0x00FFFFFF >> 16) # lui $a1, 0xff -/* 001240 80000640 85470002 */ lh $a3, 2($t2) -/* 001244 80000644 34A5FFFF */ ori $a1, (0x00FFFFFF & 0xFFFF) # ori $a1, $a1, 0xffff -/* 001248 80000648 000758C0 */ sll $t3, $a3, 3 -/* 00124C 8000064C 25640004 */ addiu $a0, $t3, 4 -/* 001250 80000650 0C01C327 */ jal func_80070C9C -/* 001254 80000654 AFA40068 */ sw $a0, 0x68($sp) -/* 001258 80000658 AE020000 */ sw $v0, ($s0) -/* 00125C 8000065C 8FA70068 */ lw $a3, 0x68($sp) -/* 001260 80000660 8E460010 */ lw $a2, 0x10($s2) -/* 001264 80000664 24040027 */ li $a0, 39 -/* 001268 80000668 0C01DB9A */ jal func_80076E68 -/* 00126C 8000066C 00402825 */ move $a1, $v0 -/* 001270 80000670 8E450010 */ lw $a1, 0x10($s2) -/* 001274 80000674 0C01DBBA */ jal func_80076EE8 -/* 001278 80000678 24040027 */ li $a0, 39 -/* 00127C 8000067C 8E040000 */ lw $a0, ($s0) -/* 001280 80000680 0C031DEA */ jal func_800C77A8 -/* 001284 80000684 00402825 */ move $a1, $v0 -/* 001288 80000688 8E0C0000 */ lw $t4, ($s0) -/* 00128C 8000068C 3C0500FF */ lui $a1, %hi(D_00FF0004) # $a1, 0xff -/* 001290 80000690 85840002 */ lh $a0, 2($t4) -/* 001294 80000694 34A5FFFF */ ori $a1, (0x00FFFFFF & 0xFFFF) # ori $a1, $a1, 0xffff -/* 001298 80000698 00046880 */ sll $t5, $a0, 2 -/* 00129C 8000069C 0C01C327 */ jal func_80070C9C -/* 0012A0 800006A0 01A02025 */ move $a0, $t5 -/* 0012A4 800006A4 3C088011 */ lui $t0, %hi(D_80115D0C) # $t0, 0x8011 -/* 0012A8 800006A8 8E040000 */ lw $a0, ($s0) -/* 0012AC 800006AC 25085D0C */ addiu $t0, %lo(D_80115D0C) # addiu $t0, $t0, 0x5d0c -/* 0012B0 800006B0 AD020000 */ sw $v0, ($t0) -/* 0012B4 800006B4 848E0002 */ lh $t6, 2($a0) -/* 0012B8 800006B8 00003025 */ move $a2, $zero -/* 0012BC 800006BC 19C00021 */ blez $t6, .L80000744 -/* 0012C0 800006C0 240D0028 */ li $t5, 40 -/* 0012C4 800006C4 00002825 */ move $a1, $zero -/* 0012C8 800006C8 00401825 */ move $v1, $v0 -/* 0012CC 800006CC 00003825 */ move $a3, $zero -.L800006D0: -/* 0012D0 800006D0 00877821 */ addu $t7, $a0, $a3 -/* 0012D4 800006D4 8DF80008 */ lw $t8, 8($t7) -/* 0012D8 800006D8 24C60001 */ addiu $a2, $a2, 1 -/* 0012DC 800006DC AC780000 */ sw $t8, ($v1) -/* 0012E0 800006E0 8D190000 */ lw $t9, ($t0) -/* 0012E4 800006E4 00000000 */ nop -/* 0012E8 800006E8 03251821 */ addu $v1, $t9, $a1 -/* 0012EC 800006EC 8C620000 */ lw $v0, ($v1) -/* 0012F0 800006F0 00000000 */ nop -/* 0012F4 800006F4 30490001 */ andi $t1, $v0, 1 -/* 0012F8 800006F8 11200007 */ beqz $t1, .L80000718 -/* 0012FC 800006FC 244A0001 */ addiu $t2, $v0, 1 -/* 001300 80000700 AC6A0000 */ sw $t2, ($v1) -/* 001304 80000704 8D0B0000 */ lw $t3, ($t0) -/* 001308 80000708 00000000 */ nop -/* 00130C 8000070C 01651821 */ addu $v1, $t3, $a1 -/* 001310 80000710 8C620000 */ lw $v0, ($v1) -/* 001314 80000714 00000000 */ nop -.L80000718: -/* 001318 80000718 0222082B */ sltu $at, $s1, $v0 -/* 00131C 8000071C 10200002 */ beqz $at, .L80000728 -/* 001320 80000720 00000000 */ nop -/* 001324 80000724 00408825 */ move $s1, $v0 -.L80000728: -/* 001328 80000728 8E040000 */ lw $a0, ($s0) -/* 00132C 8000072C 24A50004 */ addiu $a1, %lo(D_00FF0004) # addiu $a1, $a1, 4 -/* 001330 80000730 848C0002 */ lh $t4, 2($a0) -/* 001334 80000734 24630004 */ addiu $v1, $v1, 4 -/* 001338 80000738 00CC082A */ slt $at, $a2, $t4 -/* 00133C 8000073C 1420FFE4 */ bnez $at, .L800006D0 -/* 001340 80000740 24E70008 */ addiu $a3, $a3, 8 -.L80000744: -/* 001344 80000744 3C098011 */ lui $t1, %hi(gALHeap) # $t1, 0x8011 -/* 001348 80000748 240E0028 */ li $t6, 40 -/* 00134C 8000074C 240F0060 */ li $t7, 96 -/* 001350 80000750 24180006 */ li $t8, 6 -/* 001354 80000754 24190002 */ li $t9, 2 -/* 001358 80000758 25295CE8 */ addiu $t1, %lo(gALHeap) # addiu $t1, $t1, 0x5ce8 -/* 00135C 8000075C 8FA60098 */ lw $a2, 0x98($sp) -/* 001360 80000760 AFAD0070 */ sw $t5, 0x70($sp) -/* 001364 80000764 AFAE0074 */ sw $t6, 0x74($sp) -/* 001368 80000768 AFAF0078 */ sw $t7, 0x78($sp) -/* 00136C 8000076C AFA00080 */ sw $zero, 0x80($sp) -/* 001370 80000770 A3B8008C */ sb $t8, 0x8c($sp) -/* 001374 80000774 A3B9008D */ sb $t9, 0x8d($sp) -/* 001378 80000778 AFA00088 */ sw $zero, 0x88($sp) -/* 00137C 8000077C AFA90084 */ sw $t1, 0x84($sp) -/* 001380 80000780 27A40070 */ addiu $a0, $sp, 0x70 -/* 001384 80000784 0C000998 */ jal func_80002660 -/* 001388 80000788 2405000C */ li $a1, 12 -/* 00138C 8000078C 24040018 */ li $a0, 24 -/* 001390 80000790 0C000889 */ jal func_80002224 -/* 001394 80000794 24050078 */ li $a1, 120 -/* 001398 80000798 3C03800E */ lui $v1, %hi(gMusicPlayer) # $v1, 0x800e -/* 00139C 8000079C 2463C630 */ addiu $v1, %lo(gMusicPlayer) # addiu $v1, $v1, -0x39d0 -/* 0013A0 800007A0 AC620000 */ sw $v0, ($v1) -/* 0013A4 800007A4 00402025 */ move $a0, $v0 -/* 0013A8 800007A8 0C002C04 */ jal func_8000B010 -/* 0013AC 800007AC 24050012 */ li $a1, 18 -/* 0013B0 800007B0 24040010 */ li $a0, 16 -/* 0013B4 800007B4 0C000889 */ jal func_80002224 -/* 0013B8 800007B8 24050032 */ li $a1, 50 -/* 0013BC 800007BC 3C01800E */ lui $at, %hi(gSndFxPlayer) # $at, 0x800e -/* 0013C0 800007C0 3C0500FF */ lui $a1, (0x00FFFFFF >> 16) # lui $a1, 0xff -/* 0013C4 800007C4 AC22C634 */ sw $v0, %lo(gSndFxPlayer)($at) -/* 0013C8 800007C8 34A5FFFF */ ori $a1, (0x00FFFFFF & 0xFFFF) # ori $a1, $a1, 0xffff -/* 0013CC 800007CC 0C01C327 */ jal func_80070C9C -/* 0013D0 800007D0 02202025 */ move $a0, $s1 -/* 0013D4 800007D4 3C018011 */ lui $at, %hi(D_80115CFC) # $at, 0x8011 -/* 0013D8 800007D8 3C0500FF */ lui $a1, (0x00FFFFFF >> 16) # lui $a1, 0xff -/* 0013DC 800007DC AC225CFC */ sw $v0, %lo(D_80115CFC)($at) -/* 0013E0 800007E0 34A5FFFF */ ori $a1, (0x00FFFFFF & 0xFFFF) # ori $a1, $a1, 0xffff -/* 0013E4 800007E4 0C01C327 */ jal func_80070C9C -/* 0013E8 800007E8 02202025 */ move $a0, $s1 -/* 0013EC 800007EC 3C0E8011 */ lui $t6, %hi(gALHeap) # $t6, 0x8011 -/* 0013F0 800007F0 3C018011 */ lui $at, %hi(D_80115D00) # $at, 0x8011 -/* 0013F4 800007F4 240A0096 */ li $t2, 150 -/* 0013F8 800007F8 240B0020 */ li $t3, 32 -/* 0013FC 800007FC 240C0010 */ li $t4, 16 -/* 001400 80000800 240D0001 */ li $t5, 1 -/* 001404 80000804 25CE5CE8 */ addiu $t6, %lo(gALHeap) # addiu $t6, $t6, 0x5ce8 -/* 001408 80000808 AC225D00 */ sw $v0, %lo(D_80115D00)($at) -/* 00140C 8000080C AFAA0050 */ sw $t2, 0x50($sp) -/* 001410 80000810 AFAB004C */ sw $t3, 0x4c($sp) -/* 001414 80000814 AFAC0054 */ sw $t4, 0x54($sp) -/* 001418 80000818 A7AD005C */ sh $t5, 0x5c($sp) -/* 00141C 8000081C AFAE0058 */ sw $t6, 0x58($sp) -/* 001420 80000820 0C000C70 */ jal alSndpNew -/* 001424 80000824 27A4004C */ addiu $a0, $sp, 0x4c -/* 001428 80000828 0C000A94 */ jal func_80002A50 -/* 00142C 8000082C 00000000 */ nop -/* 001430 80000830 0C00025A */ jal func_80000968 -/* 001434 80000834 00002025 */ move $a0, $zero -/* 001438 80000838 0C01C450 */ jal func_80071140 -/* 00143C 8000083C 02402025 */ move $a0, $s2 -/* 001440 80000840 0C000C63 */ jal func_8000318C -/* 001444 80000844 2404000A */ li $a0, 10 -/* 001448 80000848 3C01800E */ lui $at, %hi(D_800DC648) # $at, 0x800e -/* 00144C 8000084C AC20C648 */ sw $zero, %lo(D_800DC648)($at) -/* 001450 80000850 3C018011 */ lui $at, %hi(D_80115D40) # $at, 0x8011 -/* 001454 80000854 A0205D40 */ sb $zero, %lo(D_80115D40)($at) -/* 001458 80000858 3C018011 */ lui $at, %hi(D_80115D41) # $at, 0x8011 -/* 00145C 8000085C A0205D41 */ sb $zero, %lo(D_80115D41)($at) -/* 001460 80000860 3C01800E */ lui $at, %hi(D_800DC658) # $at, 0x800e -/* 001464 80000864 AC20C658 */ sw $zero, %lo(D_800DC658)($at) -/* 001468 80000868 3C018011 */ lui $at, %hi(D_80115F78) # $at, 0x8011 -/* 00146C 8000086C 8FBF002C */ lw $ra, 0x2c($sp) -/* 001470 80000870 A0205F78 */ sb $zero, %lo(D_80115F78)($at) -/* 001474 80000874 3C018011 */ lui $at, %hi(D_80115F79) # $at, 0x8011 -/* 001478 80000878 8FB00020 */ lw $s0, 0x20($sp) -/* 00147C 8000087C 8FB10024 */ lw $s1, 0x24($sp) -/* 001480 80000880 8FB20028 */ lw $s2, 0x28($sp) -/* 001484 80000884 A0205F79 */ sb $zero, %lo(D_80115F79)($at) -/* 001488 80000888 03E00008 */ jr $ra -/* 00148C 8000088C 27BD0098 */ addiu $sp, $sp, 0x98 - diff --git a/asm/non_matchings/unknown_001050/func_80000890.s b/asm/non_matchings/unknown_001050/func_80000890.s deleted file mode 100644 index 30bb6194..00000000 --- a/asm/non_matchings/unknown_001050/func_80000890.s +++ /dev/null @@ -1,57 +0,0 @@ -glabel func_80000890 -/* 001490 80000890 3C0F8011 */ lui $t7, %hi(D_80115F79) # $t7, 0x8011 -/* 001494 80000894 91EF5F79 */ lbu $t7, %lo(D_80115F79)($t7) -/* 001498 80000898 27BDFFE8 */ addiu $sp, $sp, -0x18 -/* 00149C 8000089C AFBF0014 */ sw $ra, 0x14($sp) -/* 0014A0 800008A0 AFA40018 */ sw $a0, 0x18($sp) -/* 0014A4 800008A4 15E0002C */ bnez $t7, .L80000958 -/* 0014A8 800008A8 308E00FF */ andi $t6, $a0, 0xff -/* 0014AC 800008AC 3C028011 */ lui $v0, %hi(D_80115F78) # $v0, 0x8011 -/* 0014B0 800008B0 24425F78 */ addiu $v0, %lo(D_80115F78) # addiu $v0, $v0, 0x5f78 -/* 0014B4 800008B4 31D800FF */ andi $t8, $t6, 0xff -/* 0014B8 800008B8 17000027 */ bnez $t8, .L80000958 -/* 0014BC 800008BC A04E0000 */ sb $t6, ($v0) -/* 0014C0 800008C0 3C04800E */ lui $a0, %hi(D_800DC638) # $a0, 0x800e -/* 0014C4 800008C4 24190100 */ li $t9, 256 -/* 0014C8 800008C8 3C01800E */ lui $at, %hi(D_800DC66C) # $at, 0x800e -/* 0014CC 800008CC 9084C638 */ lbu $a0, %lo(D_800DC638)($a0) -/* 0014D0 800008D0 0C000664 */ jal musicSetRelativeVolume -/* 0014D4 800008D4 AC39C66C */ sw $t9, %lo(D_800DC66C)($at) -/* 0014D8 800008D8 3C05800E */ lui $a1, %hi(D_800DC66C) # $a1, 0x800e -/* 0014DC 800008DC 8CA5C66C */ lw $a1, %lo(D_800DC66C)($a1) -/* 0014E0 800008E0 00002025 */ move $a0, $zero -/* 0014E4 800008E4 000541C0 */ sll $t0, $a1, 7 -/* 0014E8 800008E8 2505FFFF */ addiu $a1, $t0, -1 -/* 0014EC 800008EC 30A9FFFF */ andi $t1, $a1, 0xffff -/* 0014F0 800008F0 0C001298 */ jal func_80004A60 -/* 0014F4 800008F4 01202825 */ move $a1, $t1 -/* 0014F8 800008F8 3C05800E */ lui $a1, %hi(D_800DC66C) # $a1, 0x800e -/* 0014FC 800008FC 8CA5C66C */ lw $a1, %lo(D_800DC66C)($a1) -/* 001500 80000900 24040001 */ li $a0, 1 -/* 001504 80000904 000551C0 */ sll $t2, $a1, 7 -/* 001508 80000908 2545FFFF */ addiu $a1, $t2, -1 -/* 00150C 8000090C 30ABFFFF */ andi $t3, $a1, 0xffff -/* 001510 80000910 0C001298 */ jal func_80004A60 -/* 001514 80000914 01602825 */ move $a1, $t3 -/* 001518 80000918 3C05800E */ lui $a1, %hi(D_800DC66C) # $a1, 0x800e -/* 00151C 8000091C 8CA5C66C */ lw $a1, %lo(D_800DC66C)($a1) -/* 001520 80000920 24040002 */ li $a0, 2 -/* 001524 80000924 000561C0 */ sll $t4, $a1, 7 -/* 001528 80000928 2585FFFF */ addiu $a1, $t4, -1 -/* 00152C 8000092C 30ADFFFF */ andi $t5, $a1, 0xffff -/* 001530 80000930 0C001298 */ jal func_80004A60 -/* 001534 80000934 01A02825 */ move $a1, $t5 -/* 001538 80000938 3C05800E */ lui $a1, %hi(D_800DC66C) # $a1, 0x800e -/* 00153C 8000093C 8CA5C66C */ lw $a1, %lo(D_800DC66C)($a1) -/* 001540 80000940 24040004 */ li $a0, 4 -/* 001544 80000944 000571C0 */ sll $t6, $a1, 7 -/* 001548 80000948 25C5FFFF */ addiu $a1, $t6, -1 -/* 00154C 8000094C 30AFFFFF */ andi $t7, $a1, 0xffff -/* 001550 80000950 0C001298 */ jal func_80004A60 -/* 001554 80000954 01E02825 */ move $a1, $t7 -.L80000958: -/* 001558 80000958 8FBF0014 */ lw $ra, 0x14($sp) -/* 00155C 8000095C 27BD0018 */ addiu $sp, $sp, 0x18 -/* 001560 80000960 03E00008 */ jr $ra -/* 001564 80000964 00000000 */ nop - diff --git a/asm/non_matchings/unknown_001050/func_80000D00.s b/asm/non_matchings/unknown_001050/func_80000D00.s deleted file mode 100644 index 5eecacc0..00000000 --- a/asm/non_matchings/unknown_001050/func_80000D00.s +++ /dev/null @@ -1,198 +0,0 @@ -glabel func_80000D00 -/* 001900 80000D00 27BDFFD0 */ addiu $sp, $sp, -0x30 -/* 001904 80000D04 3C058011 */ lui $a1, %hi(D_80115D3C) # $a1, 0x8011 -/* 001908 80000D08 24A55D3C */ addiu $a1, %lo(D_80115D3C) # addiu $a1, $a1, 0x5d3c -/* 00190C 80000D0C 8CA30000 */ lw $v1, ($a1) -/* 001910 80000D10 AFB00018 */ sw $s0, 0x18($sp) -/* 001914 80000D14 309000FF */ andi $s0, $a0, 0xff -/* 001918 80000D18 AFBF002C */ sw $ra, 0x2c($sp) -/* 00191C 80000D1C AFB40028 */ sw $s4, 0x28($sp) -/* 001920 80000D20 AFB30024 */ sw $s3, 0x24($sp) -/* 001924 80000D24 AFB20020 */ sw $s2, 0x20($sp) -/* 001928 80000D28 AFB1001C */ sw $s1, 0x1c($sp) -/* 00192C 80000D2C 18600023 */ blez $v1, .L80000DBC -/* 001930 80000D30 AFA40030 */ sw $a0, 0x30($sp) -/* 001934 80000D34 3C028011 */ lui $v0, %hi(D_80115D38) # $v0, 0x8011 -/* 001938 80000D38 24425D38 */ addiu $v0, %lo(D_80115D38) # addiu $v0, $v0, 0x5d38 -/* 00193C 80000D3C 8C4E0000 */ lw $t6, ($v0) -/* 001940 80000D40 44834000 */ mtc1 $v1, $f8 -/* 001944 80000D44 01D0C021 */ addu $t8, $t6, $s0 -/* 001948 80000D48 44982000 */ mtc1 $t8, $f4 -/* 00194C 80000D4C 468042A0 */ cvt.s.w $f10, $f8 -/* 001950 80000D50 3C04800E */ lui $a0, %hi(D_800DC650) # $a0, 0x800e -/* 001954 80000D54 2484C650 */ addiu $a0, %lo(D_800DC650) # addiu $a0, $a0, -0x39b0 -/* 001958 80000D58 468021A0 */ cvt.s.w $f6, $f4 -/* 00195C 80000D5C 3C013FF0 */ li $at, 0x3FF00000 # 1.875000 -/* 001960 80000D60 44819800 */ mtc1 $at, $f19 -/* 001964 80000D64 460A3403 */ div.s $f16, $f6, $f10 -/* 001968 80000D68 44809000 */ mtc1 $zero, $f18 -/* 00196C 80000D6C AC580000 */ sw $t8, ($v0) -/* 001970 80000D70 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 001974 80000D74 E4900000 */ swc1 $f16, ($a0) -/* 001978 80000D78 C4840000 */ lwc1 $f4, ($a0) -/* 00197C 80000D7C 00000000 */ nop -/* 001980 80000D80 46002221 */ cvt.d.s $f8, $f4 -/* 001984 80000D84 4628903C */ c.lt.d $f18, $f8 -/* 001988 80000D88 00000000 */ nop -/* 00198C 80000D8C 45000005 */ bc1f .L80000DA4 -/* 001990 80000D90 00000000 */ nop -/* 001994 80000D94 44813000 */ mtc1 $at, $f6 -/* 001998 80000D98 AC400000 */ sw $zero, ($v0) -/* 00199C 80000D9C ACA00000 */ sw $zero, ($a1) -/* 0019A0 80000DA0 E4860000 */ swc1 $f6, ($a0) -.L80000DA4: -/* 0019A4 80000DA4 3C04800E */ lui $a0, %hi(D_800DC638) # $a0, 0x800e -/* 0019A8 80000DA8 9084C638 */ lbu $a0, %lo(D_800DC638)($a0) -/* 0019AC 80000DAC 0C000664 */ jal musicSetRelativeVolume -/* 0019B0 80000DB0 00000000 */ nop -/* 0019B4 80000DB4 10000023 */ b .L80000E44 -/* 0019B8 80000DB8 00000000 */ nop -.L80000DBC: -/* 0019BC 80000DBC 04610021 */ bgez $v1, .L80000E44 -/* 0019C0 80000DC0 3C028011 */ lui $v0, %hi(D_80115D38) # $v0, 0x8011 -/* 0019C4 80000DC4 24425D38 */ addiu $v0, %lo(D_80115D38) # addiu $v0, $v0, 0x5d38 -/* 0019C8 80000DC8 8C590000 */ lw $t9, ($v0) -/* 0019CC 80000DCC 44832000 */ mtc1 $v1, $f4 -/* 0019D0 80000DD0 03304823 */ subu $t1, $t9, $s0 -/* 0019D4 80000DD4 44895000 */ mtc1 $t1, $f10 -/* 0019D8 80000DD8 468024A0 */ cvt.s.w $f18, $f4 -/* 0019DC 80000DDC 3C013F80 */ li $at, 0x3F800000 # 1.000000 -/* 0019E0 80000DE0 44813000 */ mtc1 $at, $f6 -/* 0019E4 80000DE4 46805420 */ cvt.s.w $f16, $f10 -/* 0019E8 80000DE8 3C04800E */ lui $a0, %hi(D_800DC650) # $a0, 0x800e -/* 0019EC 80000DEC 2484C650 */ addiu $a0, %lo(D_800DC650) # addiu $a0, $a0, -0x39b0 -/* 0019F0 80000DF0 46128203 */ div.s $f8, $f16, $f18 -/* 0019F4 80000DF4 44809000 */ mtc1 $zero, $f18 -/* 0019F8 80000DF8 44809800 */ mtc1 $zero, $f19 -/* 0019FC 80000DFC AC490000 */ sw $t1, ($v0) -/* 001A00 80000E00 46083281 */ sub.s $f10, $f6, $f8 -/* 001A04 80000E04 E48A0000 */ swc1 $f10, ($a0) -/* 001A08 80000E08 C4840000 */ lwc1 $f4, ($a0) -/* 001A0C 80000E0C 00000000 */ nop -/* 001A10 80000E10 46002421 */ cvt.d.s $f16, $f4 -/* 001A14 80000E14 4632803C */ c.lt.d $f16, $f18 -/* 001A18 80000E18 00000000 */ nop -/* 001A1C 80000E1C 45000005 */ bc1f .L80000E34 -/* 001A20 80000E20 00000000 */ nop -/* 001A24 80000E24 44803000 */ mtc1 $zero, $f6 -/* 001A28 80000E28 AC400000 */ sw $zero, ($v0) -/* 001A2C 80000E2C ACA00000 */ sw $zero, ($a1) -/* 001A30 80000E30 E4860000 */ swc1 $f6, ($a0) -.L80000E34: -/* 001A34 80000E34 3C04800E */ lui $a0, %hi(D_800DC638) # $a0, 0x800e -/* 001A38 80000E38 9084C638 */ lbu $a0, %lo(D_800DC638)($a0) -/* 001A3C 80000E3C 0C000664 */ jal musicSetRelativeVolume -/* 001A40 80000E40 00000000 */ nop -.L80000E44: -/* 001A44 80000E44 3C13800E */ lui $s3, %hi(D_800DC658) # $s3, 0x800e -/* 001A48 80000E48 2673C658 */ addiu $s3, %lo(D_800DC658) # addiu $s3, $s3, -0x39a8 -/* 001A4C 80000E4C 8E620000 */ lw $v0, ($s3) -/* 001A50 80000E50 00000000 */ nop -/* 001A54 80000E54 18400029 */ blez $v0, .L80000EFC -/* 001A58 80000E58 00000000 */ nop -/* 001A5C 80000E5C 18400027 */ blez $v0, .L80000EFC -/* 001A60 80000E60 00009025 */ move $s2, $zero -/* 001A64 80000E64 3C118011 */ lui $s1, %hi(D_80115D48) # $s1, 0x8011 -/* 001A68 80000E68 26315D48 */ addiu $s1, %lo(D_80115D48) # addiu $s1, $s1, 0x5d48 -/* 001A6C 80000E6C 0200A025 */ move $s4, $s0 -.L80000E70: -/* 001A70 80000E70 862A0002 */ lh $t2, 2($s1) -/* 001A74 80000E74 00000000 */ nop -/* 001A78 80000E78 01545823 */ subu $t3, $t2, $s4 -/* 001A7C 80000E7C A62B0002 */ sh $t3, 2($s1) -/* 001A80 80000E80 862C0002 */ lh $t4, 2($s1) -/* 001A84 80000E84 00000000 */ nop -/* 001A88 80000E88 1D800017 */ bgtz $t4, .L80000EE8 -/* 001A8C 80000E8C 00000000 */ nop -/* 001A90 80000E90 96240000 */ lhu $a0, ($s1) -/* 001A94 80000E94 8E250004 */ lw $a1, 4($s1) -/* 001A98 80000E98 0C000741 */ jal func_80001D04 -/* 001A9C 80000E9C 02408025 */ move $s0, $s2 -/* 001AA0 80000EA0 8E6D0000 */ lw $t5, ($s3) -/* 001AA4 80000EA4 00000000 */ nop -/* 001AA8 80000EA8 25A2FFFF */ addiu $v0, $t5, -1 -/* 001AAC 80000EAC 0242082A */ slt $at, $s2, $v0 -/* 001AB0 80000EB0 1020000F */ beqz $at, .L80000EF0 -/* 001AB4 80000EB4 AE620000 */ sw $v0, ($s3) -/* 001AB8 80000EB8 962F0008 */ lhu $t7, 8($s1) -/* 001ABC 80000EBC 8638000A */ lh $t8, 0xa($s1) -/* 001AC0 80000EC0 8E39000C */ lw $t9, 0xc($s1) -/* 001AC4 80000EC4 A62F0000 */ sh $t7, ($s1) -/* 001AC8 80000EC8 A6380002 */ sh $t8, 2($s1) -/* 001ACC 80000ECC AE390004 */ sw $t9, 4($s1) -/* 001AD0 80000ED0 26100001 */ addiu $s0, $s0, 1 -.L80000ED4: -/* 001AD4 80000ED4 0202082A */ slt $at, $s0, $v0 -/* 001AD8 80000ED8 1420FFFE */ bnez $at, .L80000ED4 -/* 001ADC 80000EDC 26100001 */ addiu $s0, $s0, 1 -/* 001AE0 80000EE0 10000004 */ b .L80000EF4 -/* 001AE4 80000EE4 0242082A */ slt $at, $s2, $v0 -.L80000EE8: -/* 001AE8 80000EE8 26520001 */ addiu $s2, $s2, 1 -/* 001AEC 80000EEC 26310008 */ addiu $s1, $s1, 8 -.L80000EF0: -/* 001AF0 80000EF0 0242082A */ slt $at, $s2, $v0 -.L80000EF4: -/* 001AF4 80000EF4 1420FFDE */ bnez $at, .L80000E70 -/* 001AF8 80000EF8 00000000 */ nop -.L80000EFC: -/* 001AFC 80000EFC 3C10800E */ lui $s0, %hi(gMusicPlayer) # $s0, 0x800e -/* 001B00 80000F00 2610C630 */ addiu $s0, %lo(gMusicPlayer) # addiu $s0, $s0, -0x39d0 -/* 001B04 80000F04 3C058011 */ lui $a1, %hi(D_80115CFC) # $a1, 0x8011 -/* 001B08 80000F08 8CA55CFC */ lw $a1, %lo(D_80115CFC)($a1) -/* 001B0C 80000F0C 8E040000 */ lw $a0, ($s0) -/* 001B10 80000F10 3C06800E */ lui $a2, %hi(D_800DC65C) # $a2, 0x800e -/* 001B14 80000F14 3C078011 */ lui $a3, %hi(D_80115D88) # $a3, 0x8011 -/* 001B18 80000F18 24E75D88 */ addiu $a3, %lo(D_80115D88) # addiu $a3, $a3, 0x5d88 -/* 001B1C 80000F1C 0C0008CB */ jal func_8000232C -/* 001B20 80000F20 24C6C65C */ addiu $a2, %lo(D_800DC65C) # addiu $a2, $a2, -0x39a4 -/* 001B24 80000F24 3C04800E */ lui $a0, %hi(gSndFxPlayer) # $a0, 0x800e -/* 001B28 80000F28 3C058011 */ lui $a1, %hi(D_80115D00) # $a1, 0x8011 -/* 001B2C 80000F2C 8CA55D00 */ lw $a1, %lo(D_80115D00)($a1) -/* 001B30 80000F30 8C84C634 */ lw $a0, %lo(gSndFxPlayer)($a0) -/* 001B34 80000F34 3C06800E */ lui $a2, %hi(D_800DC660) # $a2, 0x800e -/* 001B38 80000F38 3C078011 */ lui $a3, %hi(D_80115E80) # $a3, 0x8011 -/* 001B3C 80000F3C 24E75E80 */ addiu $a3, %lo(D_80115E80) # addiu $a3, $a3, 0x5e80 -/* 001B40 80000F40 0C0008CB */ jal func_8000232C -/* 001B44 80000F44 24C6C660 */ addiu $a2, %lo(D_800DC660) # addiu $a2, $a2, -0x39a0 -/* 001B48 80000F48 3C118011 */ lui $s1, %hi(D_80115D30) # $s1, 0x8011 -/* 001B4C 80000F4C 26315D30 */ addiu $s1, %lo(D_80115D30) # addiu $s1, $s1, 0x5d30 -/* 001B50 80000F50 86280000 */ lh $t0, ($s1) -/* 001B54 80000F54 2401FFFF */ li $at, -1 -/* 001B58 80000F58 15010019 */ bne $t0, $at, .L80000FC0 -/* 001B5C 80000F5C 8FBF002C */ lw $ra, 0x2c($sp) -/* 001B60 80000F60 8E040000 */ lw $a0, ($s0) -/* 001B64 80000F64 00000000 */ nop -/* 001B68 80000F68 8C890018 */ lw $t1, 0x18($a0) -/* 001B6C 80000F6C 00000000 */ nop -/* 001B70 80000F70 11200013 */ beqz $t1, .L80000FC0 -/* 001B74 80000F74 8FBF002C */ lw $ra, 0x2c($sp) -/* 001B78 80000F78 0C031E24 */ jal alCSPGetTempo -/* 001B7C 80000F7C 00000000 */ nop -/* 001B80 80000F80 3C0A0393 */ lui $t2, (0x03938700 >> 16) # lui $t2, 0x393 -/* 001B84 80000F84 354A8700 */ ori $t2, (0x03938700 & 0xFFFF) # ori $t2, $t2, 0x8700 -/* 001B88 80000F88 0142001A */ div $zero, $t2, $v0 -/* 001B8C 80000F8C 14400002 */ bnez $v0, .L80000F98 -/* 001B90 80000F90 00000000 */ nop -/* 001B94 80000F94 0007000D */ break 7 -.L80000F98: -/* 001B98 80000F98 2401FFFF */ li $at, -1 -/* 001B9C 80000F9C 14410004 */ bne $v0, $at, .L80000FB0 -/* 001BA0 80000FA0 3C018000 */ lui $at, 0x8000 -/* 001BA4 80000FA4 15410002 */ bne $t2, $at, .L80000FB0 -/* 001BA8 80000FA8 00000000 */ nop -/* 001BAC 80000FAC 0006000D */ break 6 -.L80000FB0: -/* 001BB0 80000FB0 00005812 */ mflo $t3 -/* 001BB4 80000FB4 A62B0000 */ sh $t3, ($s1) -/* 001BB8 80000FB8 00000000 */ nop -/* 001BBC 80000FBC 8FBF002C */ lw $ra, 0x2c($sp) -.L80000FC0: -/* 001BC0 80000FC0 8FB00018 */ lw $s0, 0x18($sp) -/* 001BC4 80000FC4 8FB1001C */ lw $s1, 0x1c($sp) -/* 001BC8 80000FC8 8FB20020 */ lw $s2, 0x20($sp) -/* 001BCC 80000FCC 8FB30024 */ lw $s3, 0x24($sp) -/* 001BD0 80000FD0 8FB40028 */ lw $s4, 0x28($sp) -/* 001BD4 80000FD4 03E00008 */ jr $ra -/* 001BD8 80000FD8 27BD0030 */ addiu $sp, $sp, 0x30 - diff --git a/asm/non_matchings/unknown_001050/func_80001358.s b/asm/non_matchings/unknown_001050/func_80001358.s deleted file mode 100644 index abc91200..00000000 --- a/asm/non_matchings/unknown_001050/func_80001358.s +++ /dev/null @@ -1,65 +0,0 @@ -glabel func_80001358 -/* 001F58 80001358 27BDFFE0 */ addiu $sp, $sp, -0x20 -/* 001F5C 8000135C 308700FF */ andi $a3, $a0, 0xff -/* 001F60 80001360 24010064 */ li $at, 100 -/* 001F64 80001364 AFBF0014 */ sw $ra, 0x14($sp) -/* 001F68 80001368 AFA40020 */ sw $a0, 0x20($sp) -/* 001F6C 8000136C AFA50024 */ sw $a1, 0x24($sp) -/* 001F70 80001370 10E10013 */ beq $a3, $at, .L800013C0 -/* 001F74 80001374 AFA60028 */ sw $a2, 0x28($sp) -/* 001F78 80001378 3C04800E */ lui $a0, %hi(gMusicPlayer) # $a0, 0x800e -/* 001F7C 8000137C 8C84C630 */ lw $a0, %lo(gMusicPlayer)($a0) -/* 001F80 80001380 30E500FF */ andi $a1, $a3, 0xff -/* 001F84 80001384 0C031E68 */ jal alCSPGetChlVol -/* 001F88 80001388 A3A70023 */ sb $a3, 0x23($sp) -/* 001F8C 8000138C 8FAE0028 */ lw $t6, 0x28($sp) -/* 001F90 80001390 93A70023 */ lbu $a3, 0x23($sp) -/* 001F94 80001394 004E1821 */ addu $v1, $v0, $t6 -/* 001F98 80001398 306F00FF */ andi $t7, $v1, 0xff -/* 001F9C 8000139C 29E10080 */ slti $at, $t7, 0x80 -/* 001FA0 800013A0 14200002 */ bnez $at, .L800013AC -/* 001FA4 800013A4 306600FF */ andi $a2, $v1, 0xff -/* 001FA8 800013A8 2406007F */ li $a2, 127 -.L800013AC: -/* 001FAC 800013AC 3C04800E */ lui $a0, %hi(gMusicPlayer) # $a0, 0x800e -/* 001FB0 800013B0 8C84C630 */ lw $a0, %lo(gMusicPlayer)($a0) -/* 001FB4 800013B4 30E500FF */ andi $a1, $a3, 0xff -/* 001FB8 800013B8 0C031E50 */ jal alCSPSetChlVol -/* 001FBC 800013BC A3A6001F */ sb $a2, 0x1f($sp) -.L800013C0: -/* 001FC0 800013C0 93B80027 */ lbu $t8, 0x27($sp) -/* 001FC4 800013C4 24010064 */ li $at, 100 -/* 001FC8 800013C8 13010014 */ beq $t8, $at, .L8000141C -/* 001FCC 800013CC 3C04800E */ lui $a0, %hi(gMusicPlayer) # $a0, 0x800e -/* 001FD0 800013D0 8C84C630 */ lw $a0, %lo(gMusicPlayer)($a0) -/* 001FD4 800013D4 0C031E68 */ jal alCSPGetChlVol -/* 001FD8 800013D8 03002825 */ move $a1, $t8 -/* 001FDC 800013DC 8FB90028 */ lw $t9, 0x28($sp) -/* 001FE0 800013E0 93A50027 */ lbu $a1, 0x27($sp) -/* 001FE4 800013E4 0322082A */ slt $at, $t9, $v0 -/* 001FE8 800013E8 10200005 */ beqz $at, .L80001400 -/* 001FEC 800013EC 3C04800E */ lui $a0, %hi(gMusicPlayer) # $a0, 0x800e -/* 001FF0 800013F0 00593023 */ subu $a2, $v0, $t9 -/* 001FF4 800013F4 30C800FF */ andi $t0, $a2, 0xff -/* 001FF8 800013F8 10000002 */ b .L80001404 -/* 001FFC 800013FC 01003025 */ move $a2, $t0 -.L80001400: -/* 002000 80001400 00003025 */ move $a2, $zero -.L80001404: -/* 002004 80001404 8C84C630 */ lw $a0, %lo(gMusicPlayer)($a0) -/* 002008 80001408 0C031E50 */ jal alCSPSetChlVol -/* 00200C 8000140C A3A6001E */ sb $a2, 0x1e($sp) -/* 002010 80001410 93A2001E */ lbu $v0, 0x1e($sp) -/* 002014 80001414 10000007 */ b .L80001434 -/* 002018 80001418 8FBF0014 */ lw $ra, 0x14($sp) -.L8000141C: -/* 00201C 8000141C 93A9001F */ lbu $t1, 0x1f($sp) -/* 002020 80001420 240A007F */ li $t2, 127 -/* 002024 80001424 01491023 */ subu $v0, $t2, $t1 -/* 002028 80001428 304B00FF */ andi $t3, $v0, 0xff -/* 00202C 8000142C 01601025 */ move $v0, $t3 -/* 002030 80001430 8FBF0014 */ lw $ra, 0x14($sp) -.L80001434: -/* 002034 80001434 27BD0020 */ addiu $sp, $sp, 0x20 -/* 002038 80001438 03E00008 */ jr $ra -/* 00203C 8000143C 00000000 */ nop diff --git a/asm/non_matchings/unknown_003260/alSndpNew.s b/asm/non_matchings/unknown_003260/func_800031C0.s similarity index 99% rename from asm/non_matchings/unknown_003260/alSndpNew.s rename to asm/non_matchings/unknown_003260/func_800031C0.s index a04ce6a1..bf4d6d9a 100644 --- a/asm/non_matchings/unknown_003260/alSndpNew.s +++ b/asm/non_matchings/unknown_003260/func_800031C0.s @@ -1,4 +1,4 @@ -glabel alSndpNew +glabel func_800031C0 /* 003DC0 800031C0 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 003DC4 800031C4 AFB20028 */ sw $s2, 0x28($sp) /* 003DC8 800031C8 3C12800E */ lui $s2, %hi(D_800DC6BC) # $s2, 0x800e diff --git a/asm/non_matchings/unknown_066AA0/func_8006C3E0.s b/asm/non_matchings/unknown_066AA0/func_8006C3E0.s index 09df58b3..de3f95a4 100644 --- a/asm/non_matchings/unknown_066AA0/func_8006C3E0.s +++ b/asm/non_matchings/unknown_066AA0/func_8006C3E0.s @@ -62,7 +62,7 @@ glabel func_8006C3E0 /* 06D0BC 8006C4BC 0C01E040 */ jal func_80078100 /* 06D0C0 8006C4C0 24841260 */ addiu $a0, %lo(D_80121260) # addiu $a0, $a0, 0x1260 /* 06D0C4 8006C4C4 3C048012 */ lui $a0, %hi(D_80121260) # $a0, 0x8012 -/* 06D0C8 8006C4C8 0C000114 */ jal func_80000450 +/* 06D0C8 8006C4C8 0C000114 */ jal audio_init /* 06D0CC 8006C4CC 24841260 */ addiu $a0, %lo(D_80121260) # addiu $a0, $a0, 0x1260 /* 06D0D0 8006C4D0 0C002010 */ jal func_80008040 /* 06D0D4 8006C4D4 00000000 */ nop diff --git a/asm/non_matchings/unknown_0C81A0/func_800C77A8.s b/asm/non_matchings/unknown_0C81A0/alSeqFileNew.s similarity index 97% rename from asm/non_matchings/unknown_0C81A0/func_800C77A8.s rename to asm/non_matchings/unknown_0C81A0/alSeqFileNew.s index d09696c5..e77f2ea1 100644 --- a/asm/non_matchings/unknown_0C81A0/func_800C77A8.s +++ b/asm/non_matchings/unknown_0C81A0/alSeqFileNew.s @@ -1,4 +1,4 @@ -glabel func_800C77A8 +glabel alSeqFileNew /* 0C83A8 800C77A8 848E0002 */ lh $t6, 2($a0) /* 0C83AC 800C77AC 00001025 */ move $v0, $zero /* 0C83B0 800C77B0 00801825 */ move $v1, $a0 diff --git a/src/unknown_001050.c b/src/unknown_001050.c index 9560e2e9..50f2b37d 100644 --- a/src/unknown_001050.c +++ b/src/unknown_001050.c @@ -35,6 +35,7 @@ extern s32 musicVolumeSliderPercentage; extern s32 D_800DC658; extern u8 D_800DC65C; extern u8 D_800DC660; +extern s32 D_800DC66C; extern u8 D_800DC670; extern u8 D_800EBF60; @@ -46,7 +47,8 @@ typedef struct unk80115CF8 { s16 unk2; } unk80115CF8; -extern unk80115CF8 *D_80115CF8; +extern ALSeqFile *D_80115CF8; +extern void *D_80115CFC; extern u8 D_80115D04; extern u8 D_80115D05; @@ -71,12 +73,13 @@ typedef struct unk80115D1C { u8 unk1; u8 unk2; } unk80115D1C; - +extern void *D_80115D00; +extern u32 *D_80115D0C; extern unk80115D1C* D_80115D1C; extern s32 D_80115D20; extern s32 D_80115D24; -extern s32 D_80115D28; -extern s32 D_80115D2C; +extern u32 D_80115D28; +extern u32 D_80115D2C; extern s16 D_80115D30; extern s32 D_80115D38; extern s32 D_80115D3C; @@ -85,30 +88,147 @@ extern u8 D_80115D41; extern unk80115D48 D_80115D48[8]; extern ALCSeq D_80115D88; extern ALCSeq D_80115E80; -extern s8 D_80115F78; -extern s8 D_80115F79; +extern u8 D_80115F78; +extern u8 D_80115F79; extern s32 D_80115F7C; extern u32 D_80115F84; extern u32 D_80115F88; -#if 1 -GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80000450.s") -#else -void func_80000450(void){ - u32 *tmp; - ALBankFile *tmp2; + + +typedef struct audioMgrConfig_s{ + u32 unk00; + u32 unk04; + u32 maxChannels; + ALHeap* hp; + u16 unk10; +} audioMgrConfig; + +typedef struct musicConfig_s{ + u32 unk00; + u32 unk04; + u32 unk08; + u32 unk0c; + u32 unk10; + ALHeap *heap; + u32 unk18; + u8 unk1c; + u8 unk1d; +} musicConfig; + +void func_80000968(s32 arg0); +ALCSPlayer* func_80002224(s32, s32); +void func_8000B010(ALCSPlayer*, u8); +void *func_80070C9C(u32, u32); +void *func_80076C58(u32); +void *alHeapDBAlloc(u8 *file, s32 line, ALHeap *hp, s32 num, s32 size); + +void audio_init(u32 arg0){ + s32 iCnt; + s32 tmp; + musicConfig mConfig; + u32 *reg_s2; + u32 seqfSize; + u32 seq_max_len; + u32 tmp2; + audioMgrConfig audConfig; + + seq_max_len = 0; alHeapInit(&gALHeap, &D_800EBF60, 0x00029D88); - tmp = func_80076C58(38); - D_80115D14 = (ALBankFile*) func_80070C9C(tmp[2] - tmp[1], 0x00FFFFFF); - func_80076E68(39, D_80115D14, tmp[1], tmp[2] - tmp[1]); - alBnkfNew(D_80115D14, func_80076EE8(39, tmp[2])); + + reg_s2 = func_80076C58(38); + D_80115D14 = (ALBankFile*) func_80070C9C(reg_s2[2] - reg_s2[1], 0x00FFFFFF); + func_80076E68(39, D_80115D14, reg_s2[1], reg_s2[2] - reg_s2[1]); + alBnkfNew(D_80115D14, func_80076EE8(39, reg_s2[2])); + D_80115D28 = reg_s2[7] - reg_s2[6]; + + D_80115D18 = (unk80115D18 *) func_80070C9C(D_80115D28, 0x00FFFFFF); + func_80076E68(39, D_80115D18, reg_s2[6], D_80115D28); + D_80115D20 = D_80115D28/10; + + D_80115D2C = reg_s2[6]-reg_s2[5]; + D_80115D1C = (unk80115D1C *) func_80070C9C(D_80115D2C, 0x00FFFFFF); + func_80076E68(39, D_80115D1C, reg_s2[5], D_80115D2C); + D_80115D24 = D_80115D2C/3; + + D_80115D10 = (ALBankFile *)func_80070C9C(reg_s2[0], 0x00FFFFFF); + func_80076E68(39, D_80115D10, 0, reg_s2[0]); + alBnkfNew(D_80115D10, func_80076EE8(39, reg_s2[0])); + D_80115CF8 = (ALSeqFile *) alHeapDBAlloc(0,0,&gALHeap,1,4); + func_80076E68(39, D_80115CF8, reg_s2[4], 4); + + seqfSize = (D_80115CF8->seqCount)*8 + 4; + D_80115CF8 = func_80070C9C(seqfSize, 0x00FFFFFF); + func_80076E68(39, D_80115CF8, reg_s2[4], seqfSize); + alSeqFileNew(D_80115CF8, func_80076EE8(39, reg_s2[4])); + D_80115D0C = (u32 *)func_80070C9C( (D_80115CF8->seqCount)*4, 0x00FFFFFF); + + + for(iCnt = 0; iCnt < D_80115CF8->seqCount; iCnt++){ + (u32*)((u32) D_80115CF8 + 8 + iCnt*8); + D_80115D0C[iCnt] = D_80115CF8->seqArray[iCnt].len; + if(D_80115D0C[iCnt] & 1){ + D_80115D0C[iCnt]++; + } + if(seq_max_len < D_80115D0C[iCnt]){ + seq_max_len = D_80115D0C[iCnt]; + } + } + + + mConfig.unk00 = 40; + mConfig.unk04 = 40; + mConfig.unk08 = 96; + mConfig.unk10 = 0; + mConfig.unk1c = 6; + mConfig.unk1d = 2; + mConfig.unk18 = 0; + mConfig.heap = &gALHeap; + func_80002660(&mConfig, 12, arg0); + gMusicPlayer = func_80002224(24, 120); + func_8000B010(gMusicPlayer, 18); + gSndFxPlayer = func_80002224(16, 50); + D_80115CFC = func_80070C9C( seq_max_len, 0x00FFFFFF); + D_80115D00 = func_80070C9C( seq_max_len, 0x00FFFFFF); + audConfig.unk04 = 150; + audConfig.unk00 = 32; + audConfig.maxChannels = 16; + audConfig.unk10 = 1; + audConfig.hp = &gALHeap; + func_800031C0(&audConfig); + func_80002A50(); + func_80000968(0); + func_80071140(reg_s2); + func_8000318C(10); + D_800DC648 = 0; + D_80115D40 = 0; + D_80115D41 = 0; + D_800DC658 = 0; + D_80115F78 = 0; + D_80115F79 = 0; + return; } -#endif - -GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80000890.s") - +void musicSetRelativeVolume(u8); void func_80004A60(u8, u16); + + +void func_80000890(u8 arg0){ + if(!D_80115F79){ + D_80115F78 = arg0; + if(D_80115F78 == 0){ + D_800DC66C = 256; + musicSetRelativeVolume(D_800DC638); + func_80004A60(0,D_800DC66C*128-1); + func_80004A60(1,D_800DC66C*128-1); + func_80004A60(2,D_800DC66C*128-1); + func_80004A60(4,D_800DC66C*128-1); + } + } +} + + + void func_80000968(s32 arg0) { switch(arg0) { case 1: @@ -204,7 +324,65 @@ void func_80000CBC(void) { musicSetRelativeVolume(D_800DC638); } -GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80000D00.s") +void func_80001D04(u16,void*); +void func_8000232C(ALCSPlayer*, void*, u8*, ALCSeq*); + +void func_80000D00(u8 arg0){ + s32 reg_s2; + s32 j; + if(D_80115D3C > 0){ + + D_80115D38 += arg0; + D_800DC650 = ((f32)D_80115D38)/((f32)D_80115D3C); + + if((f64)D_800DC650 > 1.0f){ + D_80115D38 = 0; + D_80115D3C = 0; + D_800DC650 = 1.0f; + } + musicSetRelativeVolume(D_800DC638); + }else if(D_80115D3C < 0) { + + D_80115D38 -= arg0; + D_800DC650 = 1.0f - ((f32)D_80115D38)/((f32)D_80115D3C); + if((f64)D_800DC650 < 0){ + D_80115D38 = 0; + D_80115D3C = 0; + D_800DC650 = 0.0f; + } + musicSetRelativeVolume(D_800DC638); + } + + if(D_800DC658 > 0){ + //reg_arg0 = arg0; + for(reg_s2 = 0; reg_s2 < D_800DC658;){ + D_80115D48[reg_s2].unk2 -= arg0; + if(D_80115D48[reg_s2].unk2 <= 0){ + j = reg_s2; + func_80001D04(D_80115D48[reg_s2].unk0, D_80115D48[reg_s2].unk4); + + D_800DC658 -= 1; + while(j < D_800DC658){ + D_80115D48[reg_s2].unk0 = D_80115D48[reg_s2 + 1].unk0; + D_80115D48[reg_s2].unk2 = D_80115D48[reg_s2 + 1].unk2; + D_80115D48[reg_s2].unk4 = D_80115D48[reg_s2 + 1].unk4; + j++; + //break; + } + j++; + } + else{ + reg_s2++; + } + } + } + + func_8000232C(gMusicPlayer, D_80115CFC, &D_800DC65C, &D_80115D88); + func_8000232C(gSndFxPlayer, D_80115D00, &D_800DC660, &D_80115E80); + if(D_80115D30 == -1 && gMusicPlayer->target){ + D_80115D30 = 0x03938700/alCSPGetTempo(gMusicPlayer); + } +} void func_80000FDC(u16 arg0, s32 arg1, f32 arg2) { if (D_800DC658 < 8) { @@ -319,29 +497,32 @@ void func_800012E8(void){ return; } -#if 1 -GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001358.s") -#else -void func_80001358(u32 arg0, u32 arg1, u32 arg2){ - u8 updatedVol; + +u8 func_80001358(u8 arg0, u8 arg1, s32 arg2){ + u8 val_1f; + u8 val_1e; + s32 updatedVol; + //u8 fadeIn_chan = arg0; if(!(arg0 == 100)){ - updatedVol = arg2 + alCSPGetChlVol(gMusicPlayer,arg0); - if(updatedVol < 0){ - updatedVol = 127; + val_1f = arg2 + alCSPGetChlVol(gMusicPlayer,arg0); + if(val_1f > 127){ + val_1f = 127; } - alCSPSetChlVol(gMusicPlayer,arg0, updatedVol); + alCSPSetChlVol(gMusicPlayer,arg0, val_1f); } + if(arg1 != 100){ - updatedVol = alCSPGetChlVol(gMusicPlayer,arg1) - arg2; - if(updatedVol < 0){ - updatedVol = 0; - } - alCSPSetChlVol(gMusicPlayer,arg1, updatedVol); + + updatedVol = alCSPGetChlVol(gMusicPlayer,arg1); + val_1e = (updatedVol > arg2) ? updatedVol - arg2 : 0; + alCSPSetChlVol(gMusicPlayer,arg1, val_1e); + return val_1e; + } + else{ + return 127-val_1f; } - return; } -#endif u8 alSeqpGetChlFXMix(ALCSPlayer*, u8); @@ -438,7 +619,7 @@ u8 func_80001980(void) { return D_80115D05; } -extern f32 D_800DC66C; + GLOBAL_ASM("asm/non_matchings/unknown_001050/musicSetRelativeVolume.s") GLOBAL_ASM("asm/non_matchings/unknown_001050/func_80001A3C.s") @@ -534,7 +715,7 @@ u16 func_800020E8(void) { } u8 func_80002110(void) { - return D_80115CF8->unk2; + return D_80115CF8->seqCount; } void func_80002128(unk80115D18 **arg0, s32 *arg1, s32 *arg2) { @@ -602,7 +783,7 @@ ALCSPlayer *func_80002224(s32 _max_voices, s32 _max_events){ void func_800022BC(u8 arg0, ALCSPlayer* arg1) { func_80002570(arg1); - if (arg0 < D_80115CF8->unk2) { + if (arg0 < D_80115CF8->seqCount) { if (arg1 == gMusicPlayer) { D_800DC65C = arg0; return; @@ -612,7 +793,6 @@ void func_800022BC(u8 arg0, ALCSPlayer* arg1) { } -extern u32 D_80115D0C; #if 1 GLOBAL_ASM("asm/non_matchings/unknown_001050/func_8000232C.s") #else diff --git a/src/unknown_003260.c b/src/unknown_003260.c index 922de1ed..d0ff13bf 100644 --- a/src/unknown_003260.c +++ b/src/unknown_003260.c @@ -84,7 +84,7 @@ void func_8000318C(s32 arg0) { } } -GLOBAL_ASM("asm/non_matchings/unknown_003260/alSndpNew.s") +GLOBAL_ASM("asm/non_matchings/unknown_003260/func_800031C0.s") GLOBAL_ASM("asm/non_matchings/unknown_003260/_sndpVoiceHandler.s") GLOBAL_ASM("asm/non_matchings/unknown_003260/_handleEvent.s") GLOBAL_ASM("asm/non_matchings/unknown_003260/func_8000410C.s") diff --git a/src/unknown_066AA0.c b/src/unknown_066AA0.c index 33b3e70a..c31fd0a0 100644 --- a/src/unknown_066AA0.c +++ b/src/unknown_066AA0.c @@ -1467,7 +1467,7 @@ void func_8006C3E0(void) { func_8007A310(1, &D_80121260); func_80076BA0(); func_80078100(&D_80121260); - func_80000450(&D_80121260); + audio_init(&D_80121260); func_80008040(); D_800DD384 = func_8006A10C(); func_8007AC70(); diff --git a/src/unknown_0C81A0.c b/src/unknown_0C81A0.c index 32f19620..0b30edd0 100644 --- a/src/unknown_0C81A0.c +++ b/src/unknown_0C81A0.c @@ -9,4 +9,4 @@ void dummy_800C75A8(void) {} GLOBAL_ASM("asm/non_matchings/unknown_0C81A0/_bnkfPatchBank.s") GLOBAL_ASM("asm/non_matchings/unknown_0C81A0/alBnkfNew.s") -GLOBAL_ASM("asm/non_matchings/unknown_0C81A0/func_800C77A8.s") +GLOBAL_ASM("asm/non_matchings/unknown_0C81A0/alSeqFileNew.s")