From efb3771247def0a4284094db5097adf4d9b5534b Mon Sep 17 00:00:00 2001 From: Mittenshugg Date: Wed, 5 Aug 2020 01:34:49 -0500 Subject: [PATCH] identify libaudio functions --- .../unknown_001050/func_80002224.s | 2 +- asm/non_matchings/unknown_003260/D_80002A98.s | 2 +- .../{func_80003470.s => _handleEvent.s} | 26 ++++---- .../{D_800033C8.s => _sndpVoiceHandler.s} | 4 +- asm/non_matchings/unknown_003260/alSndpNew.s | 8 +-- .../unknown_003260/func_80002660.s | 4 +- .../unknown_003260/func_80002C00.s | 2 +- .../unknown_003260/func_8000410C.s | 4 +- .../unknown_003260/func_8000418C.s | 2 +- .../unknown_003260/func_80004384.s | 4 +- .../unknown_005740/__initChanState.s | 2 +- .../{func_8000ACE0.s => __initFromBank.s} | 10 ++-- .../{func_8000A8D0.s => __lookupSoundQuick.s} | 2 +- .../{func_8000A84C.s => __lookupVoice.s} | 2 +- .../{func_8000A71C.s => __mapVoice.s} | 2 +- ...func_8000ADF4.s => __resetPerfChanState.s} | 2 +- .../{func_8000AB00.s => __seqpReleaseVoice.s} | 6 +- .../{func_8000AEFC.s => __seqpStopOsc.s} | 2 +- .../{func_8000AD98.s => __setInstChanState.s} | 2 +- .../{func_8000A7C4.s => __unmapVoice.s} | 2 +- ...func_8000AC34.s => __voiceNeedsNoteKill.s} | 2 +- .../{func_8000AA88.s => __vsDelta.s} | 2 +- .../{func_8000AAAC.s => __vsPan.s} | 2 +- .../{func_8000A9F8.s => __vsVol.s} | 2 +- .../unknown_005740/func_80006BFC.s | 2 +- .../unknown_00BC20/func_8000A71C.s | 2 +- .../unknown_00BC20/func_8000A8D0.s | 2 +- .../{func_80062B00.s => __CSPHandleMIDIMsg.s} | 60 +++++++++---------- .../{func_800637EC.s => __CSPHandleMetaMsg.s} | 6 +- ...c_80062A3C.s => __CSPHandleNextSeqEvent.s} | 14 ++--- ...unc_800629CC.s => __CSPPostNextSeqEvent.s} | 4 +- .../{func_80063984.s => __CSPRepostEvent.s} | 2 +- .../{D_80062408.s => __CSPVoiceHandler.s} | 58 +++++++++--------- .../{func_80063A34.s => __setUsptFromTempo.s} | 2 +- .../{func_80062290.s => alCSPNew.s} | 14 ++--- .../{func_80064884.s => _doModFunc.s} | 2 +- .../{func_800647D0.s => _filterBuffer.s} | 2 +- .../{func_800644A0.s => _loadBuffer.s} | 2 +- .../{func_80064224.s => _loadOutputBuffer.s} | 8 +-- .../{func_80064638.s => _saveBuffer.s} | 2 +- .../{func_80064A08.s => alFxNew.s} | 18 +++--- .../{D_80063FAC.s => alFxParamHdl.s} | 8 +-- .../{D_80063C30.s => alFxPull.s} | 16 ++--- .../{func_80064950.s => init_lpfilter.s} | 2 +- .../{func_80065668.s => __allocParam.s} | 6 +- .../{func_800656BC.s => __collectPVoices.s} | 2 +- .../{func_8006571C.s => __freePVoices.s} | 2 +- .../{func_8006569C.s => __freeParam.s} | 6 +- .../{func_800657EC.s => __nextSampleTime.s} | 2 +- .../{func_800657C4.s => __timeToSamples.s} | 4 +- ...nc_80065754.s => __timeToSamplesNoRound.s} | 2 +- .../{func_80065494.s => alAudioFrame.s} | 14 ++--- asm/non_matchings/unknown_065D30/alSynNew.s | 4 +- .../{func_80065860.s => alSynAllocFX.s} | 8 +-- .../{D_80065900.s => alAuxBusPull.s} | 2 +- .../{func_80065B20.s => alSynSetPan.s} | 4 +- ...unc_80065C38.s => alSynStartVoiceParams.s} | 6 +- data/dkr.data.s | 2 +- ...unc_800C7D04.s => __alCSeqGetTrackEvent.s} | 24 ++++---- .../{func_800C83EC.s => __alCSeqNextDelta.s} | 2 +- .../{func_800C7BE0.s => __getTrackByte.s} | 2 +- .../{func_800C7CA4.s => __readVarLen.s} | 6 +- .../unknown_0C86A0/func_800C7FFC.s | 4 +- .../{func_800C87B4.s => alClose.s} | 12 ++-- .../{func_800C87EC.s => alInit.s} | 6 +- .../{func_800C9420.s => _allocatePVoice.s} | 2 +- .../{func_800C9090.s => alEvtqFlushType.s} | 2 +- .../{func_800C9508.s => alSynAllocVoice.s} | 8 +-- .../{func_800C9650.s => alSynSetVol.s} | 6 +- .../unknown_0CA2F0/func_800C96F0.s | 2 +- .../{func_800C9780.s => alSynSetPitch.s} | 4 +- .../unknown_0CA410/func_800C9810.s | 2 +- .../{func_800C98B0.s => alSynStopVoice.s} | 4 +- .../{func_800C99E0.s => alCents2Ratio.s} | 2 +- .../{func_800C9930.s => alSynFreeVoice.s} | 6 +- .../{func_800C9AE0.s => alSynSetPriority.s} | 2 +- .../{D_800CA0D0.s => alEnvMixerPull.s} | 10 ++-- .../{func_800CA0B0.s => alFilterNew.s} | 2 +- .../unknown_0CA9A0/alLoadParam.s | 4 +- .../{D_800CBBEC.s => alLoadPull.s} | 2 +- .../{D_800CC17C.s => alResamplePull.s} | 2 +- .../{D_800CC390.s => alMainBusParam.s} | 2 +- .../{D_800CC3C0.s => alMainBusPull.s} | 2 +- .../{D_800CC514.s => alSavePull.s} | 2 +- .../{func_800D2C60.s => alSynDelete.s} | 2 +- lib/src/unknown_0C86A0.c | 8 +-- lib/src/unknown_0C91A0.c | 4 +- lib/src/unknown_0C9C90.c | 6 +- lib/src/unknown_0CA250.c | 2 +- lib/src/unknown_0CA380.c | 2 +- lib/src/unknown_0CA4B0.c | 2 +- lib/src/unknown_0CA530.c | 4 +- lib/src/unknown_0CA6E0.c | 2 +- lib/src/unknown_0CA9A0.c | 8 +-- lib/src/unknown_0CCF90.c | 6 +- lib/src/unknown_0D3160.c | 2 +- src/unknown_003260.c | 4 +- src/unknown_005740.c | 26 ++++---- src/unknown_061D30.c | 16 ++--- src/unknown_064830.c | 53 ++++++++-------- src/unknown_065D30.c | 16 ++--- src/unknown_066460.c | 2 +- src/unknown_066500.c | 4 +- src/unknown_0667D0.c | 2 +- undefined_syms.txt | 26 ++++---- 105 files changed, 354 insertions(+), 353 deletions(-) rename asm/non_matchings/unknown_003260/{func_80003470.s => _handleEvent.s} (98%) rename asm/non_matchings/unknown_003260/{D_800033C8.s => _sndpVoiceHandler.s} (96%) rename asm/non_matchings/unknown_005740/{func_8000ACE0.s => __initFromBank.s} (89%) rename asm/non_matchings/unknown_005740/{func_8000A8D0.s => __lookupSoundQuick.s} (99%) rename asm/non_matchings/unknown_005740/{func_8000A84C.s => __lookupVoice.s} (98%) rename asm/non_matchings/unknown_005740/{func_8000A71C.s => __mapVoice.s} (99%) rename asm/non_matchings/unknown_005740/{func_8000ADF4.s => __resetPerfChanState.s} (98%) rename asm/non_matchings/unknown_005740/{func_8000AB00.s => __seqpReleaseVoice.s} (96%) rename asm/non_matchings/unknown_005740/{func_8000AEFC.s => __seqpStopOsc.s} (99%) rename asm/non_matchings/unknown_005740/{func_8000AD98.s => __setInstChanState.s} (97%) rename asm/non_matchings/unknown_005740/{func_8000A7C4.s => __unmapVoice.s} (98%) rename asm/non_matchings/unknown_005740/{func_8000AC34.s => __voiceNeedsNoteKill.s} (98%) rename asm/non_matchings/unknown_005740/{func_8000AA88.s => __vsDelta.s} (95%) rename asm/non_matchings/unknown_005740/{func_8000AAAC.s => __vsPan.s} (98%) rename asm/non_matchings/unknown_005740/{func_8000A9F8.s => __vsVol.s} (98%) rename asm/non_matchings/unknown_061D30/{func_80062B00.s => __CSPHandleMIDIMsg.s} (96%) rename asm/non_matchings/unknown_061D30/{func_800637EC.s => __CSPHandleMetaMsg.s} (97%) rename asm/non_matchings/unknown_061D30/{func_80062A3C.s => __CSPHandleNextSeqEvent.s} (85%) rename asm/non_matchings/unknown_061D30/{func_800629CC.s => __CSPPostNextSeqEvent.s} (94%) rename asm/non_matchings/unknown_061D30/{func_80063984.s => __CSPRepostEvent.s} (98%) rename asm/non_matchings/unknown_061D30/{D_80062408.s => __CSPVoiceHandler.s} (92%) rename asm/non_matchings/unknown_061D30/{func_80063A34.s => __setUsptFromTempo.s} (97%) rename asm/non_matchings/unknown_061D30/{func_80062290.s => alCSPNew.s} (90%) rename asm/non_matchings/unknown_064830/{func_80064884.s => _doModFunc.s} (99%) rename asm/non_matchings/unknown_064830/{func_800647D0.s => _filterBuffer.s} (99%) rename asm/non_matchings/unknown_064830/{func_800644A0.s => _loadBuffer.s} (99%) rename asm/non_matchings/unknown_064830/{func_80064224.s => _loadOutputBuffer.s} (97%) rename asm/non_matchings/unknown_064830/{func_80064638.s => _saveBuffer.s} (99%) rename asm/non_matchings/unknown_064830/{func_80064A08.s => alFxNew.s} (95%) rename asm/non_matchings/unknown_064830/{D_80063FAC.s => alFxParamHdl.s} (97%) rename asm/non_matchings/unknown_064830/{D_80063C30.s => alFxPull.s} (96%) rename asm/non_matchings/unknown_064830/{func_80064950.s => init_lpfilter.s} (99%) rename asm/non_matchings/unknown_065D30/{func_80065668.s => __allocParam.s} (77%) rename asm/non_matchings/unknown_065D30/{func_800656BC.s => __collectPVoices.s} (98%) rename asm/non_matchings/unknown_065D30/{func_8006571C.s => __freePVoices.s} (97%) rename asm/non_matchings/unknown_065D30/{func_8006569C.s => __freeParam.s} (63%) rename asm/non_matchings/unknown_065D30/{func_800657EC.s => __nextSampleTime.s} (98%) rename asm/non_matchings/unknown_065D30/{func_800657C4.s => __timeToSamples.s} (84%) rename asm/non_matchings/unknown_065D30/{func_80065754.s => __timeToSamplesNoRound.s} (97%) rename asm/non_matchings/unknown_065D30/{func_80065494.s => alAudioFrame.s} (93%) rename asm/non_matchings/unknown_066460/{func_80065860.s => alSynAllocFX.s} (91%) rename asm/non_matchings/unknown_066500/{D_80065900.s => alAuxBusPull.s} (99%) rename asm/non_matchings/unknown_066500/{func_80065B20.s => alSynSetPan.s} (96%) rename asm/non_matchings/unknown_0667D0/{func_80065C38.s => alSynStartVoiceParams.s} (93%) rename lib/asm/non_matchings/unknown_0C86A0/{func_800C7D04.s => __alCSeqGetTrackEvent.s} (93%) rename lib/asm/non_matchings/unknown_0C86A0/{func_800C83EC.s => __alCSeqNextDelta.s} (99%) rename lib/asm/non_matchings/unknown_0C86A0/{func_800C7BE0.s => __getTrackByte.s} (99%) rename lib/asm/non_matchings/unknown_0C86A0/{func_800C7CA4.s => __readVarLen.s} (89%) rename lib/asm/non_matchings/unknown_0C91A0/{func_800C87B4.s => alClose.s} (57%) rename lib/asm/non_matchings/unknown_0C91A0/{func_800C87EC.s => alInit.s} (75%) rename lib/asm/non_matchings/unknown_0C9C90/{func_800C9420.s => _allocatePVoice.s} (99%) rename lib/asm/non_matchings/unknown_0C9C90/{func_800C9090.s => alEvtqFlushType.s} (99%) rename lib/asm/non_matchings/unknown_0C9C90/{func_800C9508.s => alSynAllocVoice.s} (95%) rename lib/asm/non_matchings/unknown_0CA250/{func_800C9650.s => alSynSetVol.s} (93%) rename lib/asm/non_matchings/unknown_0CA380/{func_800C9780.s => alSynSetPitch.s} (96%) rename lib/asm/non_matchings/unknown_0CA4B0/{func_800C98B0.s => alSynStopVoice.s} (95%) rename lib/asm/non_matchings/unknown_0CA530/{func_800C99E0.s => alCents2Ratio.s} (98%) rename lib/asm/non_matchings/unknown_0CA530/{func_800C9930.s => alSynFreeVoice.s} (94%) rename lib/asm/non_matchings/unknown_0CA6E0/{func_800C9AE0.s => alSynSetPriority.s} (97%) rename lib/asm/non_matchings/unknown_0CA9A0/{D_800CA0D0.s => alEnvMixerPull.s} (99%) rename lib/asm/non_matchings/unknown_0CA9A0/{func_800CA0B0.s => alFilterNew.s} (94%) rename lib/asm/non_matchings/unknown_0CA9A0/{D_800CBBEC.s => alLoadPull.s} (99%) rename lib/asm/non_matchings/unknown_0CA9A0/{D_800CC17C.s => alResamplePull.s} (99%) rename lib/asm/non_matchings/unknown_0CCF90/{D_800CC390.s => alMainBusParam.s} (96%) rename lib/asm/non_matchings/unknown_0CCF90/{D_800CC3C0.s => alMainBusPull.s} (99%) rename lib/asm/non_matchings/unknown_0CCF90/{D_800CC514.s => alSavePull.s} (99%) rename lib/asm/non_matchings/unknown_0D3160/{func_800D2C60.s => alSynDelete.s} (89%) diff --git a/asm/non_matchings/unknown_001050/func_80002224.s b/asm/non_matchings/unknown_001050/func_80002224.s index 65a078c9..d8d82490 100644 --- a/asm/non_matchings/unknown_001050/func_80002224.s +++ b/asm/non_matchings/unknown_001050/func_80002224.s @@ -22,7 +22,7 @@ glabel func_80002224 /* 002E74 80002274 24070001 */ li $a3, 1 /* 002E78 80002278 AFA20044 */ sw $v0, 0x44($sp) /* 002E7C 8000227C 00402025 */ move $a0, $v0 -/* 002E80 80002280 0C0188A4 */ jal func_80062290 +/* 002E80 80002280 0C0188A4 */ jal alCSPNew /* 002E84 80002284 27A50024 */ addiu $a1, $sp, 0x24 /* 002E88 80002288 3C088011 */ lui $t0, %hi(D_80115D10) # $t0, 0x8011 /* 002E8C 8000228C 8D085D10 */ lw $t0, %lo(D_80115D10)($t0) diff --git a/asm/non_matchings/unknown_003260/D_80002A98.s b/asm/non_matchings/unknown_003260/D_80002A98.s index 37ae24a9..82993463 100644 --- a/asm/non_matchings/unknown_003260/D_80002A98.s +++ b/asm/non_matchings/unknown_003260/D_80002A98.s @@ -80,7 +80,7 @@ glabel D_80002A98 /* 0037BC 80002BBC 1200FFD8 */ beqz $s0, .L80002B20 /* 0037C0 80002BC0 00000000 */ nop /* 0037C4 80002BC4 3C048011 */ lui $a0, %hi(D_801161D0) # $a0, 0x8011 -/* 0037C8 80002BC8 0C0321ED */ jal func_800C87B4 +/* 0037C8 80002BC8 0C0321ED */ jal alClose /* 0037CC 80002BCC 248461D0 */ addiu $a0, %lo(D_801161D0) # addiu $a0, $a0, 0x61d0 /* 0037D0 80002BD0 8FBF003C */ lw $ra, 0x3c($sp) /* 0037D4 80002BD4 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/unknown_003260/func_80003470.s b/asm/non_matchings/unknown_003260/_handleEvent.s similarity index 98% rename from asm/non_matchings/unknown_003260/func_80003470.s rename to asm/non_matchings/unknown_003260/_handleEvent.s index fbffe24f..6a4c76b0 100644 --- a/asm/non_matchings/unknown_003260/func_80003470.s +++ b/asm/non_matchings/unknown_003260/_handleEvent.s @@ -1,4 +1,4 @@ -glabel func_80003470 +glabel _handleEvent /* 004070 80003470 27BDFF30 */ addiu $sp, $sp, -0xd0 /* 004074 80003474 AFBE0038 */ sw $fp, 0x38($sp) /* 004078 80003478 AFB70034 */ sw $s7, 0x34($sp) @@ -116,7 +116,7 @@ glabel func_80003470 /* 00421C 8000361C 8FAF007C */ lw $t7, 0x7c($sp) .L80003620: /* 004220 80003620 8EE40038 */ lw $a0, 0x38($s7) -/* 004224 80003624 0C032542 */ jal func_800C9508 +/* 004224 80003624 0C032542 */ jal alSynAllocVoice /* 004228 80003628 27A600C8 */ addiu $a2, $sp, 0xc8 /* 00422C 8000362C AFA2007C */ sw $v0, 0x7c($sp) /* 004230 80003630 8FAF007C */ lw $t7, 0x7c($sp) @@ -181,7 +181,7 @@ glabel func_80003470 /* 004308 80003708 8EE40038 */ lw $a0, 0x38($s7) /* 00430C 8000370C 00003025 */ move $a2, $zero /* 004310 80003710 240703E8 */ li $a3, 1000 -/* 004314 80003714 0C032594 */ jal func_800C9650 +/* 004314 80003714 0C032594 */ jal alSynSetVol /* 004318 80003718 2445000C */ addiu $a1, $v0, 0xc /* 00431C 8000371C 8FA2006C */ lw $v0, 0x6c($sp) /* 004320 80003720 00000000 */ nop @@ -285,7 +285,7 @@ glabel func_80003470 /* 004490 80003890 00003825 */ move $a3, $zero /* 004494 80003894 00001012 */ mflo $v0 /* 004498 80003898 00024202 */ srl $t0, $v0, 8 -/* 00449C 8000389C 0C032594 */ jal func_800C9650 +/* 00449C 8000389C 0C032594 */ jal alSynSetVol /* 0044A0 800038A0 AFA80090 */ sw $t0, 0x90($sp) /* 0044A4 800038A4 8FA20090 */ lw $v0, 0x90($sp) /* 0044A8 800038A8 8EE40038 */ lw $a0, 0x38($s7) @@ -293,7 +293,7 @@ glabel func_80003470 /* 0044B0 800038B0 00065403 */ sra $t2, $a2, 0x10 /* 0044B4 800038B4 01403025 */ move $a2, $t2 /* 0044B8 800038B8 02602825 */ move $a1, $s3 -/* 0044BC 800038BC 0C032594 */ jal func_800C9650 +/* 0044BC 800038BC 0C032594 */ jal alSynSetVol /* 0044C0 800038C0 02003825 */ move $a3, $s0 /* 0044C4 800038C4 922B003C */ lbu $t3, 0x3c($s1) /* 0044C8 800038C8 924C000C */ lbu $t4, 0xc($s2) @@ -317,7 +317,7 @@ glabel func_80003470 /* 004508 80003908 304600FF */ andi $a2, $v0, 0xff .L8000390C: /* 00450C 8000390C 8EE40038 */ lw $a0, 0x38($s7) -/* 004510 80003910 0C0196C8 */ jal func_80065B20 +/* 004510 80003910 0C0196C8 */ jal alSynSetPan /* 004514 80003914 02602825 */ move $a1, $s3 /* 004518 80003918 C626002C */ lwc1 $f6, 0x2c($s1) /* 00451C 8000391C C6280028 */ lwc1 $f8, 0x28($s1) @@ -325,7 +325,7 @@ glabel func_80003470 /* 004524 80003924 46083282 */ mul.s $f10, $f6, $f8 /* 004528 80003928 02602825 */ move $a1, $s3 /* 00452C 8000392C 44065000 */ mfc1 $a2, $f10 -/* 004530 80003930 0C0325E0 */ jal func_800C9780 +/* 004530 80003930 0C0325E0 */ jal alSynSetPitch /* 004534 80003934 00000000 */ nop /* 004538 80003938 92CF0003 */ lbu $t7, 3($s6) /* 00453C 8000393C 922D003D */ lbu $t5, 0x3d($s1) @@ -432,7 +432,7 @@ glabel func_80003470 /* 0046AC 80003AAC 460084A4 */ cvt.w.s $f18, $f16 /* 0046B0 80003AB0 44109000 */ mfc1 $s0, $f18 /* 0046B4 80003AB4 44D8F800 */ ctc1 $t8, $31 -/* 0046B8 80003AB8 0C032594 */ jal func_800C9650 +/* 0046B8 80003AB8 0C032594 */ jal alSynSetVol /* 0046BC 80003ABC 02003825 */ move $a3, $s0 /* 0046C0 80003AC0 1200000A */ beqz $s0, .L80003AEC /* 0046C4 80003AC4 240E0080 */ li $t6, 128 @@ -492,7 +492,7 @@ glabel func_80003470 /* 004780 80003B80 304600FF */ andi $a2, $v0, 0xff .L80003B84: /* 004784 80003B84 8EE40038 */ lw $a0, 0x38($s7) -/* 004788 80003B88 0C0196C8 */ jal func_80065B20 +/* 004788 80003B88 0C0196C8 */ jal alSynSetPan /* 00478C 80003B8C 2625000C */ addiu $a1, $s1, 0xc .L80003B90: /* 004790 80003B90 96A20000 */ lhu $v0, ($s5) @@ -511,7 +511,7 @@ glabel func_80003470 /* 0047C4 80003BC4 46083282 */ mul.s $f10, $f6, $f8 /* 0047C8 80003BC8 2625000C */ addiu $a1, $s1, 0xc /* 0047CC 80003BCC 44065000 */ mfc1 $a2, $f10 -/* 0047D0 80003BD0 0C0325E0 */ jal func_800C9780 +/* 0047D0 80003BD0 0C0325E0 */ jal alSynSetPitch /* 0047D4 80003BD4 00000000 */ nop /* 0047D8 80003BD8 9238003E */ lbu $t8, 0x3e($s1) /* 0047DC 80003BDC 00000000 */ nop @@ -619,7 +619,7 @@ glabel func_80003470 /* 004950 80003D50 00026A02 */ srl $t5, $v0, 8 /* 004954 80003D54 000D3400 */ sll $a2, $t5, 0x10 /* 004958 80003D58 00064C03 */ sra $t1, $a2, 0x10 -/* 00495C 80003D5C 0C032594 */ jal func_800C9650 +/* 00495C 80003D5C 0C032594 */ jal alSynSetVol /* 004960 80003D60 01203025 */ move $a2, $t1 .L80003D64: /* 004964 80003D64 96A20000 */ lhu $v0, ($s5) @@ -692,7 +692,7 @@ glabel func_80003470 /* 004A68 80003E68 00026A02 */ srl $t5, $v0, 8 /* 004A6C 80003E6C 000D3400 */ sll $a2, $t5, 0x10 /* 004A70 80003E70 0006C403 */ sra $t8, $a2, 0x10 -/* 004A74 80003E74 0C032594 */ jal func_800C9650 +/* 004A74 80003E74 0C032594 */ jal alSynSetVol /* 004A78 80003E78 03003025 */ move $a2, $t8 /* 004A7C 80003E7C 96A30000 */ lhu $v1, ($s5) /* 004A80 80003E80 00000000 */ nop @@ -769,7 +769,7 @@ glabel func_80003470 /* 004B90 80003F90 460084A4 */ cvt.w.s $f18, $f16 /* 004B94 80003F94 44109000 */ mfc1 $s0, $f18 /* 004B98 80003F98 44D8F800 */ ctc1 $t8, $31 -/* 004B9C 80003F9C 0C032594 */ jal func_800C9650 +/* 004B9C 80003F9C 0C032594 */ jal alSynSetVol /* 004BA0 80003FA0 02003825 */ move $a3, $s0 /* 004BA4 80003FA4 24080002 */ li $t0, 2 /* 004BA8 80003FA8 A7A800AC */ sh $t0, 0xac($sp) diff --git a/asm/non_matchings/unknown_003260/D_800033C8.s b/asm/non_matchings/unknown_003260/_sndpVoiceHandler.s similarity index 96% rename from asm/non_matchings/unknown_003260/D_800033C8.s rename to asm/non_matchings/unknown_003260/_sndpVoiceHandler.s index 91482555..c5e6b997 100644 --- a/asm/non_matchings/unknown_003260/D_800033C8.s +++ b/asm/non_matchings/unknown_003260/_sndpVoiceHandler.s @@ -1,4 +1,4 @@ -glabel D_800033C8 +glabel _sndpVoiceHandler /* 003FC8 800033C8 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 003FCC 800033CC AFB40028 */ sw $s4, 0x28($sp) /* 003FD0 800033D0 AFB30024 */ sw $s3, 0x24($sp) @@ -24,7 +24,7 @@ glabel D_800033C8 /* 00401C 8000341C 10000004 */ b .L80003430 /* 004020 80003420 02402025 */ move $a0, $s2 .L80003424: -/* 004024 80003424 0C000D1C */ jal func_80003470 +/* 004024 80003424 0C000D1C */ jal _handleEvent /* 004028 80003428 02202825 */ move $a1, $s1 /* 00402C 8000342C 02402025 */ move $a0, $s2 .L80003430: diff --git a/asm/non_matchings/unknown_003260/alSndpNew.s b/asm/non_matchings/unknown_003260/alSndpNew.s index 4b3668bb..a04ce6a1 100644 --- a/asm/non_matchings/unknown_003260/alSndpNew.s +++ b/asm/non_matchings/unknown_003260/alSndpNew.s @@ -80,7 +80,7 @@ glabel alSndpNew /* 003EF0 800032F0 962D0010 */ lhu $t5, 0x10($s1) /* 003EF4 800032F4 00008025 */ move $s0, $zero /* 003EF8 800032F8 11A0000C */ beqz $t5, .L8000332C -/* 003EFC 800032FC 3C19800E */ lui $t9, %hi(D_800E3780) # $t9, 0x800e +/* 003EFC 800032FC 3C19800E */ lui $t9, %hi(alGlobals) # $t9, 0x800e /* 003F00 80003300 00001025 */ move $v0, $zero /* 003F04 80003304 24037FFF */ li $v1, 32767 .L80003308: @@ -94,12 +94,12 @@ glabel alSndpNew /* 003F24 80003324 1420FFF8 */ bnez $at, .L80003308 /* 003F28 80003328 00000000 */ nop .L8000332C: -/* 003F2C 8000332C 8F393780 */ lw $t9, %lo(D_800E3780)($t9) +/* 003F2C 8000332C 8F393780 */ lw $t9, %lo(alGlobals)($t9) /* 003F30 80003330 8E480000 */ lw $t0, ($s2) -/* 003F34 80003334 3C0A8000 */ lui $t2, %hi(D_800033C8) # $t2, 0x8000 +/* 003F34 80003334 3C0A8000 */ lui $t2, %hi(_sndpVoiceHandler) # $t2, 0x8000 /* 003F38 80003338 AD190038 */ sw $t9, 0x38($t0) /* 003F3C 8000333C 8E490000 */ lw $t1, ($s2) -/* 003F40 80003340 254A33C8 */ addiu $t2, %lo(D_800033C8) # addiu $t2, $t2, 0x33c8 +/* 003F40 80003340 254A33C8 */ addiu $t2, %lo(_sndpVoiceHandler) # addiu $t2, $t2, 0x33c8 /* 003F44 80003344 AD200000 */ sw $zero, ($t1) /* 003F48 80003348 8E4B0000 */ lw $t3, ($s2) /* 003F4C 8000334C 00000000 */ nop diff --git a/asm/non_matchings/unknown_003260/func_80002660.s b/asm/non_matchings/unknown_003260/func_80002660.s index 5c292b13..48fcff8d 100644 --- a/asm/non_matchings/unknown_003260/func_80002660.s +++ b/asm/non_matchings/unknown_003260/func_80002660.s @@ -94,7 +94,7 @@ glabel func_80002660 /* 0033C4 800027C4 AE710020 */ sw $s1, 0x20($s3) /* 0033C8 800027C8 AE600024 */ sw $zero, 0x24($s3) /* 0033CC 800027CC 248461D0 */ addiu $a0, %lo(D_801161D0) # addiu $a0, $a0, 0x61d0 -/* 0033D0 800027D0 0C0321FB */ jal func_800C87EC +/* 0033D0 800027D0 0C0321FB */ jal alInit /* 0033D4 800027D4 02602825 */ move $a1, $s3 /* 0033D8 800027D8 0C01C450 */ jal func_80071140 /* 0033DC 800027DC 02202025 */ move $a0, $s1 @@ -103,7 +103,7 @@ glabel func_80002660 .L800027E8: /* 0033E8 800027E8 3C048011 */ lui $a0, %hi(D_801161D0) # $a0, 0x8011 /* 0033EC 800027EC 248461D0 */ addiu $a0, %lo(D_801161D0) # addiu $a0, $a0, 0x61d0 -/* 0033F0 800027F0 0C0321FB */ jal func_800C87EC +/* 0033F0 800027F0 0C0321FB */ jal alInit /* 0033F4 800027F4 02602825 */ move $a1, $s3 .L800027F8: /* 0033F8 800027F8 3C028012 */ lui $v0, %hi(D_80119240) # $v0, 0x8012 diff --git a/asm/non_matchings/unknown_003260/func_80002C00.s b/asm/non_matchings/unknown_003260/func_80002C00.s index c1e15a64..4bceb066 100644 --- a/asm/non_matchings/unknown_003260/func_80002C00.s +++ b/asm/non_matchings/unknown_003260/func_80002C00.s @@ -57,7 +57,7 @@ glabel func_80002C00 /* 0038D4 80002CD4 008C2021 */ addu $a0, $a0, $t4 /* 0038D8 80002CD8 8C845F98 */ lw $a0, 0x5f98($a0) /* 0038DC 80002CDC 8FA60024 */ lw $a2, 0x24($sp) -/* 0038E0 80002CE0 0C019525 */ jal func_80065494 +/* 0038E0 80002CE0 0C019525 */ jal alAudioFrame /* 0038E4 80002CE4 24A59634 */ addiu $a1, %lo(D_80119634) # addiu $a1, $a1, -0x69cc /* 0038E8 80002CE8 3C0D8011 */ lui $t5, %hi(D_80116198) # $t5, 0x8011 /* 0038EC 80002CEC 24030002 */ li $v1, 2 diff --git a/asm/non_matchings/unknown_003260/func_8000410C.s b/asm/non_matchings/unknown_003260/func_8000410C.s index d2088271..450fe054 100644 --- a/asm/non_matchings/unknown_003260/func_8000410C.s +++ b/asm/non_matchings/unknown_003260/func_8000410C.s @@ -10,13 +10,13 @@ glabel func_8000410C /* 004D2C 8000412C 8F39C6BC */ lw $t9, %lo(D_800DC6BC)($t9) /* 004D30 80004130 25C5000C */ addiu $a1, $t6, 0xc /* 004D34 80004134 8F240038 */ lw $a0, 0x38($t9) -/* 004D38 80004138 0C03262C */ jal func_800C98B0 +/* 004D38 80004138 0C03262C */ jal alSynStopVoice /* 004D3C 8000413C AFA5001C */ sw $a1, 0x1c($sp) /* 004D40 80004140 3C08800E */ lui $t0, %hi(D_800DC6BC) # $t0, 0x800e /* 004D44 80004144 8D08C6BC */ lw $t0, %lo(D_800DC6BC)($t0) /* 004D48 80004148 8FA5001C */ lw $a1, 0x1c($sp) /* 004D4C 8000414C 8D040038 */ lw $a0, 0x38($t0) -/* 004D50 80004150 0C03264C */ jal func_800C9930 +/* 004D50 80004150 0C03264C */ jal alSynFreeVoice /* 004D54 80004154 00000000 */ nop .L80004158: /* 004D58 80004158 8FA40020 */ lw $a0, 0x20($sp) diff --git a/asm/non_matchings/unknown_003260/func_8000418C.s b/asm/non_matchings/unknown_003260/func_8000418C.s index 953ec77d..a9f2f2b9 100644 --- a/asm/non_matchings/unknown_003260/func_8000418C.s +++ b/asm/non_matchings/unknown_003260/func_8000418C.s @@ -6,7 +6,7 @@ glabel func_8000418C /* 004D9C 8000419C 8DCF0004 */ lw $t7, 4($t6) /* 004DA0 800041A0 00000000 */ nop /* 004DA4 800041A4 81E40005 */ lb $a0, 5($t7) -/* 004DA8 800041A8 0C032678 */ jal func_800C99E0 +/* 004DA8 800041A8 0C032678 */ jal alCents2Ratio /* 004DAC 800041AC AFA70030 */ sw $a3, 0x30($sp) /* 004DB0 800041B0 8FA70030 */ lw $a3, 0x30($sp) /* 004DB4 800041B4 3C04800E */ lui $a0, %hi(D_800DC6BC) # $a0, 0x800e diff --git a/asm/non_matchings/unknown_003260/func_80004384.s b/asm/non_matchings/unknown_003260/func_80004384.s index cc7d58d3..25f5886f 100644 --- a/asm/non_matchings/unknown_003260/func_80004384.s +++ b/asm/non_matchings/unknown_003260/func_80004384.s @@ -70,7 +70,7 @@ glabel func_80004384 /* 00508C 8000448C 000F78C0 */ sll $t7, $t7, 3 /* 005090 80004490 01E47821 */ addu $t7, $t7, $a0 /* 005094 80004494 000F7880 */ sll $t7, $t7, 2 -/* 005098 80004498 0C032678 */ jal func_800C99E0 +/* 005098 80004498 0C032678 */ jal alCents2Ratio /* 00509C 8000449C 25E4E890 */ addiu $a0, $t7, -0x1770 /* 0050A0 800044A0 8FA50024 */ lw $a1, 0x24($sp) /* 0050A4 800044A4 1000000E */ b .L800044E0 @@ -85,7 +85,7 @@ glabel func_80004384 /* 0050C4 800044C4 0019C880 */ sll $t9, $t9, 2 /* 0050C8 800044C8 03282021 */ addu $a0, $t9, $t0 /* 0050CC 800044CC 2484E890 */ addiu $a0, $a0, -0x1770 -/* 0050D0 800044D0 0C032678 */ jal func_800C99E0 +/* 0050D0 800044D0 0C032678 */ jal alCents2Ratio /* 0050D4 800044D4 AFA50024 */ sw $a1, 0x24($sp) /* 0050D8 800044D8 8FA50024 */ lw $a1, 0x24($sp) /* 0050DC 800044DC E6000028 */ swc1 $f0, 0x28($s0) diff --git a/asm/non_matchings/unknown_005740/__initChanState.s b/asm/non_matchings/unknown_005740/__initChanState.s index c9752c79..c0f867ae 100644 --- a/asm/non_matchings/unknown_005740/__initChanState.s +++ b/asm/non_matchings/unknown_005740/__initChanState.s @@ -14,7 +14,7 @@ glabel __initChanState /* 00BABC 8000AEBC 02202025 */ move $a0, $s1 /* 00BAC0 8000AEC0 01F2C021 */ addu $t8, $t7, $s2 /* 00BAC4 8000AEC4 AF000000 */ sw $zero, ($t8) -/* 00BAC8 8000AEC8 0C002B7D */ jal func_8000ADF4 +/* 00BAC8 8000AEC8 0C002B7D */ jal __resetPerfChanState /* 00BACC 8000AECC 02002825 */ move $a1, $s0 /* 00BAD0 8000AED0 92390034 */ lbu $t9, 0x34($s1) /* 00BAD4 8000AED4 26100001 */ addiu $s0, $s0, 1 diff --git a/asm/non_matchings/unknown_005740/func_8000ACE0.s b/asm/non_matchings/unknown_005740/__initFromBank.s similarity index 89% rename from asm/non_matchings/unknown_005740/func_8000ACE0.s rename to asm/non_matchings/unknown_005740/__initFromBank.s index 00fb1130..042d382f 100644 --- a/asm/non_matchings/unknown_005740/func_8000ACE0.s +++ b/asm/non_matchings/unknown_005740/__initFromBank.s @@ -1,4 +1,4 @@ -glabel func_8000ACE0 +glabel __initFromBank /* 00B8E0 8000ACE0 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 00B8E4 8000ACE4 AFB20020 */ sw $s2, 0x20($sp) /* 00B8E8 8000ACE8 00809025 */ move $s2, $a0 @@ -17,11 +17,11 @@ glabel func_8000ACE0 /* 00B918 8000AD18 19C0000C */ blez $t6, .L8000AD4C /* 00B91C 8000AD1C 02402025 */ move $a0, $s2 .L8000AD20: -/* 00B920 8000AD20 0C002B7D */ jal func_8000ADF4 +/* 00B920 8000AD20 0C002B7D */ jal __resetPerfChanState /* 00B924 8000AD24 02002825 */ move $a1, $s0 /* 00B928 8000AD28 02402025 */ move $a0, $s2 /* 00B92C 8000AD2C 02202825 */ move $a1, $s1 -/* 00B930 8000AD30 0C002B66 */ jal func_8000AD98 +/* 00B930 8000AD30 0C002B66 */ jal __setInstChanState /* 00B934 8000AD34 02003025 */ move $a2, $s0 /* 00B938 8000AD38 924F0034 */ lbu $t7, 0x34($s2) /* 00B93C 8000AD3C 26100001 */ addiu $s0, $s0, 1 @@ -35,12 +35,12 @@ glabel func_8000ACE0 /* 00B958 8000AD58 00000000 */ nop /* 00B95C 8000AD5C 13200009 */ beqz $t9, .L8000AD84 /* 00B960 8000AD60 8FBF0024 */ lw $ra, 0x24($sp) -/* 00B964 8000AD64 0C002B7D */ jal func_8000ADF4 +/* 00B964 8000AD64 0C002B7D */ jal __resetPerfChanState /* 00B968 8000AD68 02002825 */ move $a1, $s0 /* 00B96C 8000AD6C 8FA8002C */ lw $t0, 0x2c($sp) /* 00B970 8000AD70 02402025 */ move $a0, $s2 /* 00B974 8000AD74 8D050008 */ lw $a1, 8($t0) -/* 00B978 8000AD78 0C002B66 */ jal func_8000AD98 +/* 00B978 8000AD78 0C002B66 */ jal __setInstChanState /* 00B97C 8000AD7C 24060009 */ li $a2, 9 /* 00B980 8000AD80 8FBF0024 */ lw $ra, 0x24($sp) .L8000AD84: diff --git a/asm/non_matchings/unknown_005740/func_8000A8D0.s b/asm/non_matchings/unknown_005740/__lookupSoundQuick.s similarity index 99% rename from asm/non_matchings/unknown_005740/func_8000A8D0.s rename to asm/non_matchings/unknown_005740/__lookupSoundQuick.s index 3166d572..ec0344f0 100644 --- a/asm/non_matchings/unknown_005740/func_8000A8D0.s +++ b/asm/non_matchings/unknown_005740/__lookupSoundQuick.s @@ -1,4 +1,4 @@ -glabel func_8000A8D0 +glabel __lookupSoundQuick /* 00B4D0 8000A8D0 27BDFFF8 */ addiu $sp, $sp, -8 /* 00B4D4 8000A8D4 30EF00FF */ andi $t7, $a3, 0xff /* 00B4D8 8000A8D8 AFB00004 */ sw $s0, 4($sp) diff --git a/asm/non_matchings/unknown_005740/func_8000A84C.s b/asm/non_matchings/unknown_005740/__lookupVoice.s similarity index 98% rename from asm/non_matchings/unknown_005740/func_8000A84C.s rename to asm/non_matchings/unknown_005740/__lookupVoice.s index 7a8a2476..9a0c6770 100644 --- a/asm/non_matchings/unknown_005740/func_8000A84C.s +++ b/asm/non_matchings/unknown_005740/__lookupVoice.s @@ -1,4 +1,4 @@ -glabel func_8000A84C +glabel __lookupVoice /* 00B44C 8000A84C AFA50004 */ sw $a1, 4($sp) /* 00B450 8000A850 AFA60008 */ sw $a2, 8($sp) /* 00B454 8000A854 8C830064 */ lw $v1, 0x64($a0) diff --git a/asm/non_matchings/unknown_005740/func_8000A71C.s b/asm/non_matchings/unknown_005740/__mapVoice.s similarity index 99% rename from asm/non_matchings/unknown_005740/func_8000A71C.s rename to asm/non_matchings/unknown_005740/__mapVoice.s index 2f5b9305..c3962578 100644 --- a/asm/non_matchings/unknown_005740/func_8000A71C.s +++ b/asm/non_matchings/unknown_005740/__mapVoice.s @@ -1,4 +1,4 @@ -glabel func_8000A71C +glabel __mapVoice /* 00B31C 8000A71C AFA50004 */ sw $a1, 4($sp) /* 00B320 8000A720 AFA60008 */ sw $a2, 8($sp) /* 00B324 8000A724 AFA7000C */ sw $a3, 0xc($sp) diff --git a/asm/non_matchings/unknown_005740/func_8000ADF4.s b/asm/non_matchings/unknown_005740/__resetPerfChanState.s similarity index 98% rename from asm/non_matchings/unknown_005740/func_8000ADF4.s rename to asm/non_matchings/unknown_005740/__resetPerfChanState.s index bc7c385d..d7c770d7 100644 --- a/asm/non_matchings/unknown_005740/func_8000ADF4.s +++ b/asm/non_matchings/unknown_005740/__resetPerfChanState.s @@ -1,4 +1,4 @@ -glabel func_8000ADF4 +glabel __resetPerfChanState /* 00B9F4 8000ADF4 00051080 */ sll $v0, $a1, 2 /* 00B9F8 8000ADF8 8C8E0060 */ lw $t6, 0x60($a0) /* 00B9FC 8000ADFC 00451021 */ addu $v0, $v0, $a1 diff --git a/asm/non_matchings/unknown_005740/func_8000AB00.s b/asm/non_matchings/unknown_005740/__seqpReleaseVoice.s similarity index 96% rename from asm/non_matchings/unknown_005740/func_8000AB00.s rename to asm/non_matchings/unknown_005740/__seqpReleaseVoice.s index 49ce398c..c7b74c73 100644 --- a/asm/non_matchings/unknown_005740/func_8000AB00.s +++ b/asm/non_matchings/unknown_005740/__seqpReleaseVoice.s @@ -1,4 +1,4 @@ -glabel func_8000AB00 +glabel __seqpReleaseVoice /* 00B700 8000AB00 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 00B704 8000AB04 AFBF0034 */ sw $ra, 0x34($sp) /* 00B708 8000AB08 AFB60030 */ sw $s6, 0x30($sp) @@ -56,12 +56,12 @@ glabel func_8000AB00 /* 00B7C8 8000ABC8 AECD0024 */ sw $t5, 0x24($s6) /* 00B7CC 8000ABCC 8E840014 */ lw $a0, 0x14($s4) /* 00B7D0 8000ABD0 00003025 */ move $a2, $zero -/* 00B7D4 8000ABD4 0C0326B8 */ jal func_800C9AE0 +/* 00B7D4 8000ABD4 0C0326B8 */ jal alSynSetPriority /* 00B7D8 8000ABD8 26920048 */ addiu $s2, $s4, 0x48 /* 00B7DC 8000ABDC 8E840014 */ lw $a0, 0x14($s4) /* 00B7E0 8000ABE0 8FA70068 */ lw $a3, 0x68($sp) /* 00B7E4 8000ABE4 02A02825 */ move $a1, $s5 -/* 00B7E8 8000ABE8 0C032594 */ jal func_800C9650 +/* 00B7E8 8000ABE8 0C032594 */ jal alSynSetVol /* 00B7EC 8000ABEC 00003025 */ move $a2, $zero /* 00B7F0 8000ABF0 240E0005 */ li $t6, 5 /* 00B7F4 8000ABF4 8FA60068 */ lw $a2, 0x68($sp) diff --git a/asm/non_matchings/unknown_005740/func_8000AEFC.s b/asm/non_matchings/unknown_005740/__seqpStopOsc.s similarity index 99% rename from asm/non_matchings/unknown_005740/func_8000AEFC.s rename to asm/non_matchings/unknown_005740/__seqpStopOsc.s index 5fee62bc..f3fc6bfe 100644 --- a/asm/non_matchings/unknown_005740/func_8000AEFC.s +++ b/asm/non_matchings/unknown_005740/__seqpStopOsc.s @@ -1,4 +1,4 @@ -glabel func_8000AEFC +glabel __seqpStopOsc /* 00BAFC 8000AEFC 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 00BB00 8000AF00 AFBF0034 */ sw $ra, 0x34($sp) /* 00BB04 8000AF04 AFB70030 */ sw $s7, 0x30($sp) diff --git a/asm/non_matchings/unknown_005740/func_8000AD98.s b/asm/non_matchings/unknown_005740/__setInstChanState.s similarity index 97% rename from asm/non_matchings/unknown_005740/func_8000AD98.s rename to asm/non_matchings/unknown_005740/__setInstChanState.s index ce7e519d..8fd61123 100644 --- a/asm/non_matchings/unknown_005740/func_8000AD98.s +++ b/asm/non_matchings/unknown_005740/__setInstChanState.s @@ -1,4 +1,4 @@ -glabel func_8000AD98 +glabel __setInstChanState /* 00B998 8000AD98 00061080 */ sll $v0, $a2, 2 /* 00B99C 8000AD9C 8C8E0060 */ lw $t6, 0x60($a0) /* 00B9A0 8000ADA0 00461021 */ addu $v0, $v0, $a2 diff --git a/asm/non_matchings/unknown_005740/func_8000A7C4.s b/asm/non_matchings/unknown_005740/__unmapVoice.s similarity index 98% rename from asm/non_matchings/unknown_005740/func_8000A7C4.s rename to asm/non_matchings/unknown_005740/__unmapVoice.s index e44a6233..ab98ad10 100644 --- a/asm/non_matchings/unknown_005740/func_8000A7C4.s +++ b/asm/non_matchings/unknown_005740/__unmapVoice.s @@ -1,4 +1,4 @@ -glabel func_8000A7C4 +glabel __unmapVoice /* 00B3C4 8000A7C4 8C830064 */ lw $v1, 0x64($a0) /* 00B3C8 8000A7C8 00001025 */ move $v0, $zero /* 00B3CC 8000A7CC 1060001D */ beqz $v1, .L8000A844 diff --git a/asm/non_matchings/unknown_005740/func_8000AC34.s b/asm/non_matchings/unknown_005740/__voiceNeedsNoteKill.s similarity index 98% rename from asm/non_matchings/unknown_005740/func_8000AC34.s rename to asm/non_matchings/unknown_005740/__voiceNeedsNoteKill.s index 6625d182..8aa7c24a 100644 --- a/asm/non_matchings/unknown_005740/func_8000AC34.s +++ b/asm/non_matchings/unknown_005740/__voiceNeedsNoteKill.s @@ -1,4 +1,4 @@ -glabel func_8000AC34 +glabel __voiceNeedsNoteKill /* 00B834 8000AC34 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 00B838 8000AC38 AFBF0014 */ sw $ra, 0x14($sp) /* 00B83C 8000AC3C AFA40030 */ sw $a0, 0x30($sp) diff --git a/asm/non_matchings/unknown_005740/func_8000AA88.s b/asm/non_matchings/unknown_005740/__vsDelta.s similarity index 95% rename from asm/non_matchings/unknown_005740/func_8000AA88.s rename to asm/non_matchings/unknown_005740/__vsDelta.s index 0ea920a3..07c7ca37 100644 --- a/asm/non_matchings/unknown_005740/func_8000AA88.s +++ b/asm/non_matchings/unknown_005740/__vsDelta.s @@ -1,4 +1,4 @@ -glabel func_8000AA88 +glabel __vsDelta /* 00B688 8000AA88 8C8E0024 */ lw $t6, 0x24($a0) /* 00B68C 8000AA8C 240203E8 */ li $v0, 1000 /* 00B690 8000AA90 01C51823 */ subu $v1, $t6, $a1 diff --git a/asm/non_matchings/unknown_005740/func_8000AAAC.s b/asm/non_matchings/unknown_005740/__vsPan.s similarity index 98% rename from asm/non_matchings/unknown_005740/func_8000AAAC.s rename to asm/non_matchings/unknown_005740/__vsPan.s index 8d01bbd2..4d90c22f 100644 --- a/asm/non_matchings/unknown_005740/func_8000AAAC.s +++ b/asm/non_matchings/unknown_005740/__vsPan.s @@ -1,4 +1,4 @@ -glabel func_8000AAAC +glabel __vsPan /* 00B6AC 8000AAAC 908F0031 */ lbu $t7, 0x31($a0) /* 00B6B0 8000AAB0 8CAE0060 */ lw $t6, 0x60($a1) /* 00B6B4 8000AAB4 000FC080 */ sll $t8, $t7, 2 diff --git a/asm/non_matchings/unknown_005740/func_8000A9F8.s b/asm/non_matchings/unknown_005740/__vsVol.s similarity index 98% rename from asm/non_matchings/unknown_005740/func_8000A9F8.s rename to asm/non_matchings/unknown_005740/__vsVol.s index 2b09b350..fba0da1c 100644 --- a/asm/non_matchings/unknown_005740/func_8000A9F8.s +++ b/asm/non_matchings/unknown_005740/__vsVol.s @@ -1,4 +1,4 @@ -glabel func_8000A9F8 +glabel __vsVol /* 00B5F8 8000A9F8 908E0036 */ lbu $t6, 0x36($a0) /* 00B5FC 8000A9FC 908F0033 */ lbu $t7, 0x33($a0) /* 00B600 8000AA00 90990030 */ lbu $t9, 0x30($a0) diff --git a/asm/non_matchings/unknown_005740/func_80006BFC.s b/asm/non_matchings/unknown_005740/func_80006BFC.s index 0cdd629a..955e0cfe 100644 --- a/asm/non_matchings/unknown_005740/func_80006BFC.s +++ b/asm/non_matchings/unknown_005740/func_80006BFC.s @@ -190,7 +190,7 @@ glabel func_80006BFC /* 007AC4 80006EC4 46005124 */ cvt.w.s $f4, $f10 /* 007AC8 80006EC8 44042000 */ mfc1 $a0, $f4 /* 007ACC 80006ECC 44CEF800 */ ctc1 $t6, $31 -/* 007AD0 80006ED0 0C032678 */ jal func_800C99E0 +/* 007AD0 80006ED0 0C032678 */ jal alCents2Ratio /* 007AD4 80006ED4 00000000 */ nop /* 007AD8 80006ED8 3C028012 */ lui $v0, %hi(D_80119C38) # $v0, 0x8012 /* 007ADC 80006EDC 8C429C38 */ lw $v0, %lo(D_80119C38)($v0) diff --git a/asm/non_matchings/unknown_00BC20/func_8000A71C.s b/asm/non_matchings/unknown_00BC20/func_8000A71C.s index 2f5b9305..c3962578 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000A71C.s +++ b/asm/non_matchings/unknown_00BC20/func_8000A71C.s @@ -1,4 +1,4 @@ -glabel func_8000A71C +glabel __mapVoice /* 00B31C 8000A71C AFA50004 */ sw $a1, 4($sp) /* 00B320 8000A720 AFA60008 */ sw $a2, 8($sp) /* 00B324 8000A724 AFA7000C */ sw $a3, 0xc($sp) diff --git a/asm/non_matchings/unknown_00BC20/func_8000A8D0.s b/asm/non_matchings/unknown_00BC20/func_8000A8D0.s index 3166d572..ec0344f0 100644 --- a/asm/non_matchings/unknown_00BC20/func_8000A8D0.s +++ b/asm/non_matchings/unknown_00BC20/func_8000A8D0.s @@ -1,4 +1,4 @@ -glabel func_8000A8D0 +glabel __lookupSoundQuick /* 00B4D0 8000A8D0 27BDFFF8 */ addiu $sp, $sp, -8 /* 00B4D4 8000A8D4 30EF00FF */ andi $t7, $a3, 0xff /* 00B4D8 8000A8D8 AFB00004 */ sw $s0, 4($sp) diff --git a/asm/non_matchings/unknown_061D30/func_80062B00.s b/asm/non_matchings/unknown_061D30/__CSPHandleMIDIMsg.s similarity index 96% rename from asm/non_matchings/unknown_061D30/func_80062B00.s rename to asm/non_matchings/unknown_061D30/__CSPHandleMIDIMsg.s index c7789508..b95db91a 100644 --- a/asm/non_matchings/unknown_061D30/func_80062B00.s +++ b/asm/non_matchings/unknown_061D30/__CSPHandleMIDIMsg.s @@ -1,4 +1,4 @@ -glabel func_80062B00 +glabel __CSPHandleMIDIMsg /* 063700 80062B00 27BDFF28 */ addiu $sp, $sp, -0xd8 /* 063704 80062B04 AFBF003C */ sw $ra, 0x3c($sp) /* 063708 80062B08 AFB40038 */ sw $s4, 0x38($sp) @@ -40,7 +40,7 @@ glabel func_80062B00 /* 063794 80062B94 8DCF0000 */ lw $t7, ($t6) /* 063798 80062B98 26050004 */ addiu $a1, $s0, 4 /* 06379C 80062B9C 8DE60008 */ lw $a2, 8($t7) -/* 0637A0 80062BA0 0C002AC0 */ jal func_8000AB00 +/* 0637A0 80062BA0 0C002AC0 */ jal __seqpReleaseVoice /* 0637A4 80062BA4 00000000 */ nop .L80062BA8: /* 0637A8 80062BA8 8E100000 */ lw $s0, ($s0) @@ -92,7 +92,7 @@ glabel func_80062B00 /* 063850 80062C50 93A500CA */ lbu $a1, 0xca($sp) /* 063854 80062C54 326600FF */ andi $a2, $s3, 0xff /* 063858 80062C58 A3A700CB */ sb $a3, 0xcb($sp) -/* 06385C 80062C5C 0C002A34 */ jal func_8000A8D0 +/* 06385C 80062C5C 0C002A34 */ jal __lookupSoundQuick /* 063860 80062C60 AFB000DC */ sw $s0, 0xdc($sp) /* 063864 80062C64 104002D9 */ beqz $v0, .L800637CC /* 063868 80062C68 AFA20090 */ sw $v0, 0x90($sp) @@ -109,7 +109,7 @@ glabel func_80062B00 /* 063894 80062C94 AFA30058 */ sw $v1, 0x58($sp) /* 063898 80062C98 02402025 */ move $a0, $s2 /* 06389C 80062C9C 326600FF */ andi $a2, $s3, 0xff -/* 0638A0 80062CA0 0C0029C7 */ jal func_8000A71C +/* 0638A0 80062CA0 0C0029C7 */ jal __mapVoice /* 0638A4 80062CA4 A7A90094 */ sh $t1, 0x94($sp) /* 0638A8 80062CA8 8FA30058 */ lw $v1, 0x58($sp) /* 0638AC 80062CAC 104002C7 */ beqz $v0, .L800637CC @@ -119,7 +119,7 @@ glabel func_80062B00 /* 0638BC 80062CBC 93B100CA */ lbu $s1, 0xca($sp) /* 0638C0 80062CC0 AFA50050 */ sw $a1, 0x50($sp) /* 0638C4 80062CC4 AFA30058 */ sw $v1, 0x58($sp) -/* 0638C8 80062CC8 0C032542 */ jal func_800C9508 +/* 0638C8 80062CC8 0C032542 */ jal alSynAllocVoice /* 0638CC 80062CCC 27A60094 */ addiu $a2, $sp, 0x94 /* 0638D0 80062CD0 8FA30058 */ lw $v1, 0x58($sp) /* 0638D4 80062CD4 10400008 */ beqz $v0, .L80062CF8 @@ -161,7 +161,7 @@ glabel func_80062B00 /* 063958 80062D58 03282021 */ addu $a0, $t9, $t0 /* 06395C 80062D5C 00044C00 */ sll $t1, $a0, 0x10 /* 063960 80062D60 00092403 */ sra $a0, $t1, 0x10 -/* 063964 80062D64 0C032678 */ jal func_800C99E0 +/* 063964 80062D64 0C032678 */ jal alCents2Ratio /* 063968 80062D68 AFA30058 */ sw $v1, 0x58($sp) /* 06396C 80062D6C 8FA30058 */ lw $v1, 0x58($sp) /* 063970 80062D70 E6000028 */ swc1 $f0, 0x28($s0) @@ -304,11 +304,11 @@ glabel func_80062B00 /* 063B80 80062F80 46083282 */ mul.s $f10, $f6, $f8 /* 063B84 80062F84 E7AA0088 */ swc1 $f10, 0x88($sp) /* 063B88 80062F88 9051000A */ lbu $s1, 0xa($v0) -/* 063B8C 80062F8C 0C002AAB */ jal func_8000AAAC +/* 063B8C 80062F8C 0C002AAB */ jal __vsPan /* 063B90 80062F90 00000000 */ nop /* 063B94 80062F94 A3A200A3 */ sb $v0, 0xa3($sp) /* 063B98 80062F98 02002025 */ move $a0, $s0 -/* 063B9C 80062F9C 0C002A7E */ jal func_8000A9F8 +/* 063B9C 80062F9C 0C002A7E */ jal __vsVol /* 063BA0 80062FA0 02402825 */ move $a1, $s2 /* 063BA4 80062FA4 8FA80090 */ lw $t0, 0x90($sp) /* 063BA8 80062FA8 8E440014 */ lw $a0, 0x14($s2) @@ -321,7 +321,7 @@ glabel func_80062B00 /* 063BC4 80062FC4 AFB10018 */ sw $s1, 0x18($sp) /* 063BC8 80062FC8 AFA20010 */ sw $v0, 0x10($sp) /* 063BCC 80062FCC AFB3001C */ sw $s3, 0x1c($sp) -/* 063BD0 80062FD0 0C01970E */ jal func_80065C38 +/* 063BD0 80062FD0 0C01970E */ jal alSynStartVoiceParams /* 063BD4 80062FD4 AFB80014 */ sw $t8, 0x14($sp) /* 063BD8 80062FD8 8FAB0050 */ lw $t3, 0x50($sp) /* 063BDC 80062FDC 8FAC0090 */ lw $t4, 0x90($sp) @@ -362,7 +362,7 @@ glabel func_80062B00 /* 063C68 80063068 93A500CA */ lbu $a1, 0xca($sp) .L8006306C: /* 063C6C 8006306C 02402025 */ move $a0, $s2 -/* 063C70 80063070 0C002A13 */ jal func_8000A84C +/* 063C70 80063070 0C002A13 */ jal __lookupVoice /* 063C74 80063074 30E600FF */ andi $a2, $a3, 0xff /* 063C78 80063078 104001D4 */ beqz $v0, .L800637CC /* 063C7C 8006307C 00408025 */ move $s0, $v0 @@ -379,32 +379,32 @@ glabel func_80062B00 /* 063CA4 800630A4 8F290000 */ lw $t1, ($t9) /* 063CA8 800630A8 02402025 */ move $a0, $s2 /* 063CAC 800630AC 8D260008 */ lw $a2, 8($t1) -/* 063CB0 800630B0 0C002AC0 */ jal func_8000AB00 +/* 063CB0 800630B0 0C002AC0 */ jal __seqpReleaseVoice /* 063CB4 800630B4 26050004 */ addiu $a1, $s0, 4 /* 063CB8 800630B8 100001C5 */ b .L800637D0 /* 063CBC 800630BC 8FBF003C */ lw $ra, 0x3c($sp) /* 063CC0 800630C0 93A500CA */ lbu $a1, 0xca($sp) /* 063CC4 800630C4 02402025 */ move $a0, $s2 -/* 063CC8 800630C8 0C002A13 */ jal func_8000A84C +/* 063CC8 800630C8 0C002A13 */ jal __lookupVoice /* 063CCC 800630CC 30E600FF */ andi $a2, $a3, 0xff /* 063CD0 800630D0 104001BE */ beqz $v0, .L800637CC /* 063CD4 800630D4 00408025 */ move $s0, $v0 /* 063CD8 800630D8 A0530033 */ sb $s3, 0x33($v0) /* 063CDC 800630DC 00402025 */ move $a0, $v0 -/* 063CE0 800630E0 0C002A7E */ jal func_8000A9F8 +/* 063CE0 800630E0 0C002A7E */ jal __vsVol /* 063CE4 800630E4 02402825 */ move $a1, $s2 /* 063CE8 800630E8 00028C00 */ sll $s1, $v0, 0x10 /* 063CEC 800630EC 00114403 */ sra $t0, $s1, 0x10 /* 063CF0 800630F0 8E45001C */ lw $a1, 0x1c($s2) /* 063CF4 800630F4 01008825 */ move $s1, $t0 -/* 063CF8 800630F8 0C002AA2 */ jal func_8000AA88 +/* 063CF8 800630F8 0C002AA2 */ jal __vsDelta /* 063CFC 800630FC 02002025 */ move $a0, $s0 /* 063D00 80063100 00113400 */ sll $a2, $s1, 0x10 /* 063D04 80063104 0006C403 */ sra $t8, $a2, 0x10 /* 063D08 80063108 8E440014 */ lw $a0, 0x14($s2) /* 063D0C 8006310C 03003025 */ move $a2, $t8 /* 063D10 80063110 26050004 */ addiu $a1, $s0, 4 -/* 063D14 80063114 0C032594 */ jal func_800C9650 +/* 063D14 80063114 0C032594 */ jal alSynSetVol /* 063D18 80063118 00403825 */ move $a3, $v0 /* 063D1C 8006311C 100001AC */ b .L800637D0 /* 063D20 80063120 8FBF003C */ lw $ra, 0x3c($sp) @@ -418,20 +418,20 @@ glabel func_80062B00 /* 063D3C 8006313C 168A0011 */ bne $s4, $t2, .L80063184 /* 063D40 80063140 02002025 */ move $a0, $s0 /* 063D44 80063144 A20B0033 */ sb $t3, 0x33($s0) -/* 063D48 80063148 0C002A7E */ jal func_8000A9F8 +/* 063D48 80063148 0C002A7E */ jal __vsVol /* 063D4C 8006314C 02402825 */ move $a1, $s2 /* 063D50 80063150 00028C00 */ sll $s1, $v0, 0x10 /* 063D54 80063154 00117403 */ sra $t6, $s1, 0x10 /* 063D58 80063158 8E45001C */ lw $a1, 0x1c($s2) /* 063D5C 8006315C 01C08825 */ move $s1, $t6 -/* 063D60 80063160 0C002AA2 */ jal func_8000AA88 +/* 063D60 80063160 0C002AA2 */ jal __vsDelta /* 063D64 80063164 02002025 */ move $a0, $s0 /* 063D68 80063168 00113400 */ sll $a2, $s1, 0x10 /* 063D6C 8006316C 00067C03 */ sra $t7, $a2, 0x10 /* 063D70 80063170 8E440014 */ lw $a0, 0x14($s2) /* 063D74 80063174 01E03025 */ move $a2, $t7 /* 063D78 80063178 26050004 */ addiu $a1, $s0, 4 -/* 063D7C 8006317C 0C032594 */ jal func_800C9650 +/* 063D7C 8006317C 0C032594 */ jal alSynSetVol /* 063D80 80063180 00403825 */ move $a3, $v0 .L80063184: /* 063D84 80063184 8E100000 */ lw $s0, ($s0) @@ -479,11 +479,11 @@ glabel func_80062B00 /* 063E24 80063224 02002025 */ move $a0, $s0 /* 063E28 80063228 16890007 */ bne $s4, $t1, .L80063248 /* 063E2C 8006322C 00000000 */ nop -/* 063E30 80063230 0C002AAB */ jal func_8000AAAC +/* 063E30 80063230 0C002AAB */ jal __vsPan /* 063E34 80063234 02402825 */ move $a1, $s2 /* 063E38 80063238 8E440014 */ lw $a0, 0x14($s2) /* 063E3C 8006323C 26050004 */ addiu $a1, $s0, 4 -/* 063E40 80063240 0C0196C8 */ jal func_80065B20 +/* 063E40 80063240 0C0196C8 */ jal alSynSetPan /* 063E44 80063244 304600FF */ andi $a2, $v0, 0xff .L80063248: /* 063E48 80063248 8E100000 */ lw $s0, ($s0) @@ -570,20 +570,20 @@ glabel func_80062B00 /* 063F70 80063370 24010003 */ li $at, 3 /* 063F74 80063374 11A10010 */ beq $t5, $at, .L800633B8 /* 063F78 80063378 02002025 */ move $a0, $s0 -/* 063F7C 8006337C 0C002A7E */ jal func_8000A9F8 +/* 063F7C 8006337C 0C002A7E */ jal __vsVol /* 063F80 80063380 02402825 */ move $a1, $s2 /* 063F84 80063384 00028C00 */ sll $s1, $v0, 0x10 /* 063F88 80063388 0011CC03 */ sra $t9, $s1, 0x10 /* 063F8C 8006338C 8E45001C */ lw $a1, 0x1c($s2) /* 063F90 80063390 03208825 */ move $s1, $t9 -/* 063F94 80063394 0C002AA2 */ jal func_8000AA88 +/* 063F94 80063394 0C002AA2 */ jal __vsDelta /* 063F98 80063398 02002025 */ move $a0, $s0 /* 063F9C 8006339C 00113400 */ sll $a2, $s1, 0x10 /* 063FA0 800633A0 00064C03 */ sra $t1, $a2, 0x10 /* 063FA4 800633A4 8E440014 */ lw $a0, 0x14($s2) /* 063FA8 800633A8 01203025 */ move $a2, $t1 /* 063FAC 800633AC 26050004 */ addiu $a1, $s0, 4 -/* 063FB0 800633B0 0C032594 */ jal func_800C9650 +/* 063FB0 800633B0 0C032594 */ jal alSynSetVol /* 063FB4 800633B4 00403825 */ move $a3, $v0 .L800633B8: /* 063FB8 800633B8 8E100000 */ lw $s0, ($s0) @@ -660,20 +660,20 @@ glabel func_80062B00 /* 0640C0 800634C0 24010003 */ li $at, 3 /* 0640C4 800634C4 11210010 */ beq $t1, $at, .L80063508 /* 0640C8 800634C8 02002025 */ move $a0, $s0 -/* 0640CC 800634CC 0C002A7E */ jal func_8000A9F8 +/* 0640CC 800634CC 0C002A7E */ jal __vsVol /* 0640D0 800634D0 02402825 */ move $a1, $s2 /* 0640D4 800634D4 00028C00 */ sll $s1, $v0, 0x10 /* 0640D8 800634D8 00114403 */ sra $t0, $s1, 0x10 /* 0640DC 800634DC 8E45001C */ lw $a1, 0x1c($s2) /* 0640E0 800634E0 01008825 */ move $s1, $t0 -/* 0640E4 800634E4 0C002AA2 */ jal func_8000AA88 +/* 0640E4 800634E4 0C002AA2 */ jal __vsDelta /* 0640E8 800634E8 02002025 */ move $a0, $s0 /* 0640EC 800634EC 00113400 */ sll $a2, $s1, 0x10 /* 0640F0 800634F0 0006C403 */ sra $t8, $a2, 0x10 /* 0640F4 800634F4 8E440014 */ lw $a0, 0x14($s2) /* 0640F8 800634F8 03003025 */ move $a2, $t8 /* 0640FC 800634FC 26050004 */ addiu $a1, $s0, 4 -/* 064100 80063500 0C032594 */ jal func_800C9650 +/* 064100 80063500 0C032594 */ jal alSynSetVol /* 064104 80063504 00403825 */ move $a3, $v0 .L80063508: /* 064108 80063508 8E100000 */ lw $s0, ($s0) @@ -727,7 +727,7 @@ glabel func_80062B00 /* 0641B4 800635B4 8F0A0000 */ lw $t2, ($t8) /* 0641B8 800635B8 02402025 */ move $a0, $s2 /* 0641BC 800635BC 8D460008 */ lw $a2, 8($t2) -/* 0641C0 800635C0 0C002AC0 */ jal func_8000AB00 +/* 0641C0 800635C0 0C002AC0 */ jal __seqpReleaseVoice /* 0641C4 800635C4 26050004 */ addiu $a1, $s0, 4 .L800635C8: /* 0641C8 800635C8 8E100000 */ lw $s0, ($s0) @@ -817,7 +817,7 @@ glabel func_80062B00 /* 0642F8 800636F8 004DC821 */ addu $t9, $v0, $t5 /* 0642FC 800636FC 8F25000C */ lw $a1, 0xc($t9) /* 064300 80063700 02402025 */ move $a0, $s2 -/* 064304 80063704 0C002B66 */ jal func_8000AD98 +/* 064304 80063704 0C002B66 */ jal __setInstChanState /* 064308 80063708 02803025 */ move $a2, $s4 /* 06430C 8006370C 10000030 */ b .L800637D0 /* 064310 80063710 8FBF003C */ lw $ra, 0x3c($sp) @@ -839,7 +839,7 @@ glabel func_80062B00 /* 064350 80063750 24811FFF */ addiu $at, $a0, 0x1fff /* 064354 80063754 00017B43 */ sra $t7, $at, 0xd .L80063758: -/* 064358 80063758 0C032678 */ jal func_800C99E0 +/* 064358 80063758 0C032678 */ jal alCents2Ratio /* 06435C 8006375C 01E02025 */ move $a0, $t7 /* 064360 80063760 E7A00068 */ swc1 $f0, 0x68($sp) /* 064364 80063764 8FA30058 */ lw $v1, 0x58($sp) @@ -863,7 +863,7 @@ glabel func_80062B00 /* 0643A8 800637A8 26050004 */ addiu $a1, $s0, 4 /* 0643AC 800637AC 46104102 */ mul.s $f4, $f8, $f16 /* 0643B0 800637B0 44062000 */ mfc1 $a2, $f4 -/* 0643B4 800637B4 0C0325E0 */ jal func_800C9780 +/* 0643B4 800637B4 0C0325E0 */ jal alSynSetPitch /* 0643B8 800637B8 00000000 */ nop .L800637BC: /* 0643BC 800637BC 8E100000 */ lw $s0, ($s0) diff --git a/asm/non_matchings/unknown_061D30/func_800637EC.s b/asm/non_matchings/unknown_061D30/__CSPHandleMetaMsg.s similarity index 97% rename from asm/non_matchings/unknown_061D30/func_800637EC.s rename to asm/non_matchings/unknown_061D30/__CSPHandleMetaMsg.s index 4fe576eb..2f55586a 100644 --- a/asm/non_matchings/unknown_061D30/func_800637EC.s +++ b/asm/non_matchings/unknown_061D30/__CSPHandleMetaMsg.s @@ -1,4 +1,4 @@ -glabel func_800637EC +glabel __CSPHandleMetaMsg /* 0643EC 800637EC 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 0643F0 800637F0 AFBF0034 */ sw $ra, 0x34($sp) /* 0643F4 800637F4 AFB60030 */ sw $s6, 0x30($sp) @@ -29,7 +29,7 @@ glabel func_800637EC /* 064458 80063858 8C960024 */ lw $s6, 0x24($a0) /* 06445C 8006385C 46802120 */ cvt.s.w $f4, $f4 /* 064460 80063860 44052000 */ mfc1 $a1, $f4 -/* 064464 80063864 0C018E8D */ jal func_80063A34 +/* 064464 80063864 0C018E8D */ jal __setUsptFromTempo /* 064468 80063868 00000000 */ nop /* 06446C 8006386C 8EB00050 */ lw $s0, 0x50($s5) /* 064470 80063870 00000000 */ nop @@ -96,7 +96,7 @@ glabel func_800637EC /* 064540 80063940 01020019 */ multu $t0, $v0 /* 064544 80063944 0000C812 */ mflo $t9 /* 064548 80063948 AE190008 */ sw $t9, 8($s0) -/* 06454C 8006394C 0C018E61 */ jal func_80063984 +/* 06454C 8006394C 0C018E61 */ jal __CSPRepostEvent /* 064550 80063950 00000000 */ nop /* 064554 80063954 1620FFE8 */ bnez $s1, .L800638F8 /* 064558 80063958 02208025 */ move $s0, $s1 diff --git a/asm/non_matchings/unknown_061D30/func_80062A3C.s b/asm/non_matchings/unknown_061D30/__CSPHandleNextSeqEvent.s similarity index 85% rename from asm/non_matchings/unknown_061D30/func_80062A3C.s rename to asm/non_matchings/unknown_061D30/__CSPHandleNextSeqEvent.s index ebebbb9e..6644f6ae 100644 --- a/asm/non_matchings/unknown_061D30/func_80062A3C.s +++ b/asm/non_matchings/unknown_061D30/__CSPHandleNextSeqEvent.s @@ -1,4 +1,4 @@ -glabel func_80062A3C +glabel __CSPHandleNextSeqEvent /* 06363C 80062A3C 27BDFFC8 */ addiu $sp, $sp, -0x38 /* 063640 80062A40 AFBF001C */ sw $ra, 0x1c($sp) /* 063644 80062A44 AFB00018 */ sw $s0, 0x18($sp) @@ -6,7 +6,7 @@ glabel func_80062A3C /* 06364C 80062A4C 00808025 */ move $s0, $a0 /* 063650 80062A50 10C00027 */ beqz $a2, .L80062AF0 /* 063654 80062A54 27A50028 */ addiu $a1, $sp, 0x28 -/* 063658 80062A58 0C031F41 */ jal func_800C7D04 +/* 063658 80062A58 0C031F41 */ jal __alCSeqGetTrackEvent /* 06365C 80062A5C 00C02025 */ move $a0, $a2 /* 063660 80062A60 87AE0028 */ lh $t6, 0x28($sp) /* 063664 80062A64 27A50028 */ addiu $a1, $sp, 0x28 @@ -20,15 +20,15 @@ glabel func_80062A3C /* 063684 80062A84 00000000 */ nop /* 063688 80062A88 01E00008 */ jr $t7 /* 06368C 80062A8C 00000000 */ nop -/* 063690 80062A90 0C018AC0 */ jal func_80062B00 +/* 063690 80062A90 0C018AC0 */ jal __CSPHandleMIDIMsg /* 063694 80062A94 02002025 */ move $a0, $s0 -/* 063698 80062A98 0C018A73 */ jal func_800629CC +/* 063698 80062A98 0C018A73 */ jal __CSPPostNextSeqEvent /* 06369C 80062A9C 02002025 */ move $a0, $s0 /* 0636A0 80062AA0 10000014 */ b .L80062AF4 /* 0636A4 80062AA4 8FBF001C */ lw $ra, 0x1c($sp) -/* 0636A8 80062AA8 0C018DFB */ jal func_800637EC +/* 0636A8 80062AA8 0C018DFB */ jal __CSPHandleMetaMsg /* 0636AC 80062AAC 02002025 */ move $a0, $s0 -/* 0636B0 80062AB0 0C018A73 */ jal func_800629CC +/* 0636B0 80062AB0 0C018A73 */ jal __CSPPostNextSeqEvent /* 0636B4 80062AB4 02002025 */ move $a0, $s0 /* 0636B8 80062AB8 1000000E */ b .L80062AF4 /* 0636BC 80062ABC 8FBF001C */ lw $ra, 0x1c($sp) @@ -42,7 +42,7 @@ glabel func_80062A3C /* 0636DC 80062ADC 26040048 */ addiu $a0, $s0, 0x48 /* 0636E0 80062AE0 10000004 */ b .L80062AF4 /* 0636E4 80062AE4 8FBF001C */ lw $ra, 0x1c($sp) -/* 0636E8 80062AE8 0C018A73 */ jal func_800629CC +/* 0636E8 80062AE8 0C018A73 */ jal __CSPPostNextSeqEvent /* 0636EC 80062AEC 02002025 */ move $a0, $s0 .L80062AF0: /* 0636F0 80062AF0 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/unknown_061D30/func_800629CC.s b/asm/non_matchings/unknown_061D30/__CSPPostNextSeqEvent.s similarity index 94% rename from asm/non_matchings/unknown_061D30/func_800629CC.s rename to asm/non_matchings/unknown_061D30/__CSPPostNextSeqEvent.s index 199630c2..d1b7c5cd 100644 --- a/asm/non_matchings/unknown_061D30/func_800629CC.s +++ b/asm/non_matchings/unknown_061D30/__CSPPostNextSeqEvent.s @@ -1,4 +1,4 @@ -glabel func_800629CC +glabel __CSPPostNextSeqEvent /* 0635CC 800629CC 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 0635D0 800629D0 AFBF0014 */ sw $ra, 0x14($sp) /* 0635D4 800629D4 8C8E002C */ lw $t6, 0x2c($a0) @@ -9,7 +9,7 @@ glabel func_800629CC /* 0635E8 800629E8 27A5001C */ addiu $a1, $sp, 0x1c /* 0635EC 800629EC 10800010 */ beqz $a0, .L80062A30 /* 0635F0 800629F0 8FBF0014 */ lw $ra, 0x14($sp) -/* 0635F4 800629F4 0C0320FB */ jal func_800C83EC +/* 0635F4 800629F4 0C0320FB */ jal __alCSeqNextDelta /* 0635F8 800629F8 AFA70030 */ sw $a3, 0x30($sp) /* 0635FC 800629FC 8FA70030 */ lw $a3, 0x30($sp) /* 063600 80062A00 1040000B */ beqz $v0, .L80062A30 diff --git a/asm/non_matchings/unknown_061D30/func_80063984.s b/asm/non_matchings/unknown_061D30/__CSPRepostEvent.s similarity index 98% rename from asm/non_matchings/unknown_061D30/func_80063984.s rename to asm/non_matchings/unknown_061D30/__CSPRepostEvent.s index 4ff22c8b..e8889da6 100644 --- a/asm/non_matchings/unknown_061D30/func_80063984.s +++ b/asm/non_matchings/unknown_061D30/__CSPRepostEvent.s @@ -1,4 +1,4 @@ -glabel func_80063984 +glabel __CSPRepostEvent /* 064584 80063984 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 064588 80063988 AFBF0014 */ sw $ra, 0x14($sp) /* 06458C 8006398C AFA40020 */ sw $a0, 0x20($sp) diff --git a/asm/non_matchings/unknown_061D30/D_80062408.s b/asm/non_matchings/unknown_061D30/__CSPVoiceHandler.s similarity index 92% rename from asm/non_matchings/unknown_061D30/D_80062408.s rename to asm/non_matchings/unknown_061D30/__CSPVoiceHandler.s index 56220bdb..152dcef5 100644 --- a/asm/non_matchings/unknown_061D30/D_80062408.s +++ b/asm/non_matchings/unknown_061D30/__CSPVoiceHandler.s @@ -1,4 +1,4 @@ -glabel D_80062408 +glabel __CSPVoiceHandler /* 063008 80062408 27BDFF80 */ addiu $sp, $sp, -0x80 /* 06300C 8006240C AFBE0038 */ sw $fp, 0x38($sp) /* 063010 80062410 AFB70034 */ sw $s7, 0x34($sp) @@ -29,7 +29,7 @@ glabel D_80062408 /* 063070 80062470 00000000 */ nop /* 063074 80062474 01E00008 */ jr $t7 /* 063078 80062478 00000000 */ nop -/* 06307C 8006247C 0C018A8F */ jal func_80062A3C +/* 06307C 8006247C 0C018A8F */ jal __CSPHandleNextSeqEvent /* 063080 80062480 02402025 */ move $a0, $s2 /* 063084 80062484 1000013D */ b .L8006297C /* 063088 80062488 8FA50048 */ lw $a1, 0x48($sp) @@ -43,10 +43,10 @@ glabel D_80062408 /* 0630A8 800624A8 8FA50048 */ lw $a1, 0x48($sp) /* 0630AC 800624AC 8E50003C */ lw $s0, 0x3c($s2) /* 0630B0 800624B0 8E440014 */ lw $a0, 0x14($s2) -/* 0630B4 800624B4 0C03262C */ jal func_800C98B0 +/* 0630B4 800624B4 0C03262C */ jal alSynStopVoice /* 0630B8 800624B8 02002825 */ move $a1, $s0 /* 0630BC 800624BC 8E440014 */ lw $a0, 0x14($s2) -/* 0630C0 800624C0 0C03264C */ jal func_800C9930 +/* 0630C0 800624C0 0C03264C */ jal alSynFreeVoice /* 0630C4 800624C4 02002825 */ move $a1, $s0 /* 0630C8 800624C8 8E110010 */ lw $s1, 0x10($s0) /* 0630CC 800624CC 02402025 */ move $a0, $s2 @@ -54,11 +54,11 @@ glabel D_80062408 /* 0630D4 800624D4 00000000 */ nop /* 0630D8 800624D8 13200003 */ beqz $t9, .L800624E8 /* 0630DC 800624DC 00000000 */ nop -/* 0630E0 800624E0 0C002BBF */ jal func_8000AEFC +/* 0630E0 800624E0 0C002BBF */ jal __seqpStopOsc /* 0630E4 800624E4 02202825 */ move $a1, $s1 .L800624E8: /* 0630E8 800624E8 02402025 */ move $a0, $s2 -/* 0630EC 800624EC 0C0029F1 */ jal func_8000A7C4 +/* 0630EC 800624EC 0C0029F1 */ jal __unmapVoice /* 0630F0 800624F0 02002825 */ move $a1, $s0 /* 0630F4 800624F4 10000121 */ b .L8006297C /* 0630F8 800624F8 8FA50048 */ lw $a1, 0x48($sp) @@ -78,14 +78,14 @@ glabel D_80062408 /* 06312C 8006252C 01535821 */ addu $t3, $t2, $s3 /* 063130 80062530 AE2B0024 */ sw $t3, 0x24($s1) /* 063134 80062534 924C0044 */ lbu $t4, 0x44($s2) -/* 063138 80062538 0C002A7E */ jal func_8000A9F8 +/* 063138 80062538 0C002A7E */ jal __vsVol /* 06313C 8006253C A22C0030 */ sb $t4, 0x30($s1) /* 063140 80062540 00023400 */ sll $a2, $v0, 0x10 /* 063144 80062544 00066C03 */ sra $t5, $a2, 0x10 /* 063148 80062548 8E440014 */ lw $a0, 0x14($s2) /* 06314C 8006254C 01A03025 */ move $a2, $t5 /* 063150 80062550 02002825 */ move $a1, $s0 -/* 063154 80062554 0C032594 */ jal func_800C9650 +/* 063154 80062554 0C032594 */ jal alSynSetVol /* 063158 80062558 02603825 */ move $a3, $s3 /* 06315C 8006255C 10000107 */ b .L8006297C /* 063160 80062560 8FA50048 */ lw $a1, 0x48($sp) @@ -132,20 +132,20 @@ glabel D_80062408 /* 0631FC 800625FC 00000000 */ nop .L80062600: /* 063200 80062600 44CEF800 */ ctc1 $t6, $31 -/* 063204 80062604 0C002A7E */ jal func_8000A9F8 +/* 063204 80062604 0C002A7E */ jal __vsVol /* 063208 80062608 A22F0036 */ sb $t7, 0x36($s1) /* 06320C 8006260C 00028400 */ sll $s0, $v0, 0x10 /* 063210 80062610 0010C403 */ sra $t8, $s0, 0x10 /* 063214 80062614 8E45001C */ lw $a1, 0x1c($s2) /* 063218 80062618 03008025 */ move $s0, $t8 -/* 06321C 8006261C 0C002AA2 */ jal func_8000AA88 +/* 06321C 8006261C 0C002AA2 */ jal __vsDelta /* 063220 80062620 02202025 */ move $a0, $s1 /* 063224 80062624 00103400 */ sll $a2, $s0, 0x10 /* 063228 80062628 00064403 */ sra $t0, $a2, 0x10 /* 06322C 8006262C 8E440014 */ lw $a0, 0x14($s2) /* 063230 80062630 01003025 */ move $a2, $t0 /* 063234 80062634 26250004 */ addiu $a1, $s1, 4 -/* 063238 80062638 0C032594 */ jal func_800C9650 +/* 063238 80062638 0C032594 */ jal alSynSetVol /* 06323C 8006263C 00403825 */ move $a3, $v0 /* 063240 80062640 24090016 */ li $t1, 22 /* 063244 80062644 A7A9006C */ sh $t1, 0x6c($sp) @@ -180,7 +180,7 @@ glabel D_80062408 /* 0632B8 800626B8 00000000 */ nop /* 0632BC 800626BC 46045182 */ mul.s $f6, $f10, $f4 /* 0632C0 800626C0 44063000 */ mfc1 $a2, $f6 -/* 0632C4 800626C4 0C0325E0 */ jal func_800C9780 +/* 0632C4 800626C4 0C0325E0 */ jal alSynSetPitch /* 0632C8 800626C8 00000000 */ nop /* 0632CC 800626CC 240D0017 */ li $t5, 23 /* 0632D0 800626D0 A7AD006C */ sh $t5, 0x6c($sp) @@ -194,12 +194,12 @@ glabel D_80062408 /* 0632F0 800626F0 100000A2 */ b .L8006297C /* 0632F4 800626F4 8FA50048 */ lw $a1, 0x48($sp) /* 0632F8 800626F8 8FA50048 */ lw $a1, 0x48($sp) -/* 0632FC 800626FC 0C018AC0 */ jal func_80062B00 +/* 0632FC 800626FC 0C018AC0 */ jal __CSPHandleMIDIMsg /* 063300 80062700 02402025 */ move $a0, $s2 /* 063304 80062704 1000009D */ b .L8006297C /* 063308 80062708 8FA50048 */ lw $a1, 0x48($sp) /* 06330C 8006270C 8FA50048 */ lw $a1, 0x48($sp) -/* 063310 80062710 0C018DFB */ jal func_800637EC +/* 063310 80062710 0C018DFB */ jal __CSPHandleMetaMsg /* 063314 80062714 02402025 */ move $a0, $s2 /* 063318 80062718 10000098 */ b .L8006297C /* 06331C 8006271C 8FA50048 */ lw $a1, 0x48($sp) @@ -209,20 +209,20 @@ glabel D_80062408 /* 06332C 8006272C 12200092 */ beqz $s1, .L80062978 /* 063330 80062730 02202025 */ move $a0, $s1 .L80062734: -/* 063334 80062734 0C002A7E */ jal func_8000A9F8 +/* 063334 80062734 0C002A7E */ jal __vsVol /* 063338 80062738 02402825 */ move $a1, $s2 /* 06333C 8006273C 00028400 */ sll $s0, $v0, 0x10 /* 063340 80062740 00107C03 */ sra $t7, $s0, 0x10 /* 063344 80062744 8E45001C */ lw $a1, 0x1c($s2) /* 063348 80062748 01E08025 */ move $s0, $t7 -/* 06334C 8006274C 0C002AA2 */ jal func_8000AA88 +/* 06334C 8006274C 0C002AA2 */ jal __vsDelta /* 063350 80062750 02202025 */ move $a0, $s1 /* 063354 80062754 00103400 */ sll $a2, $s0, 0x10 /* 063358 80062758 0006C403 */ sra $t8, $a2, 0x10 /* 06335C 8006275C 8E440014 */ lw $a0, 0x14($s2) /* 063360 80062760 03003025 */ move $a2, $t8 /* 063364 80062764 26250004 */ addiu $a1, $s1, 4 -/* 063368 80062768 0C032594 */ jal func_800C9650 +/* 063368 80062768 0C032594 */ jal alSynSetVol /* 06336C 8006276C 00403825 */ move $a3, $v0 /* 063370 80062770 8E310000 */ lw $s1, ($s1) /* 063374 80062774 00000000 */ nop @@ -235,7 +235,7 @@ glabel D_80062408 /* 063390 80062790 11010079 */ beq $t0, $at, .L80062978 /* 063394 80062794 24090001 */ li $t1, 1 /* 063398 80062798 AE49002C */ sw $t1, 0x2c($s2) -/* 06339C 8006279C 0C018A73 */ jal func_800629CC +/* 06339C 8006279C 0C018A73 */ jal __CSPPostNextSeqEvent /* 0633A0 800627A0 02402025 */ move $a0, $s2 /* 0633A4 800627A4 10000075 */ b .L8006297C /* 0633A8 800627A8 8FA50048 */ lw $a1, 0x48($sp) @@ -275,20 +275,20 @@ glabel D_80062408 .L80062828: /* 063428 80062828 8E440014 */ lw $a0, 0x14($s2) /* 06342C 8006282C 26300004 */ addiu $s0, $s1, 4 -/* 063430 80062830 0C03262C */ jal func_800C98B0 +/* 063430 80062830 0C03262C */ jal alSynStopVoice /* 063434 80062834 02002825 */ move $a1, $s0 /* 063438 80062838 8E440014 */ lw $a0, 0x14($s2) -/* 06343C 8006283C 0C03264C */ jal func_800C9930 +/* 06343C 8006283C 0C03264C */ jal alSynFreeVoice /* 063440 80062840 02002825 */ move $a1, $s0 /* 063444 80062844 92290037 */ lbu $t1, 0x37($s1) /* 063448 80062848 02402025 */ move $a0, $s2 /* 06344C 8006284C 11200003 */ beqz $t1, .L8006285C /* 063450 80062850 00000000 */ nop -/* 063454 80062854 0C002BBF */ jal func_8000AEFC +/* 063454 80062854 0C002BBF */ jal __seqpStopOsc /* 063458 80062858 02202825 */ move $a1, $s1 .L8006285C: /* 06345C 8006285C 02402025 */ move $a0, $s2 -/* 063460 80062860 0C0029F1 */ jal func_8000A7C4 +/* 063460 80062860 0C0029F1 */ jal __unmapVoice /* 063464 80062864 02002825 */ move $a1, $s0 /* 063468 80062868 8E510064 */ lw $s1, 0x64($s2) /* 06346C 8006286C 00000000 */ nop @@ -301,13 +301,13 @@ glabel D_80062408 /* 063484 80062884 24010001 */ li $at, 1 /* 063488 80062888 1721003B */ bne $t9, $at, .L80062978 /* 06348C 8006288C 02E02025 */ move $a0, $s7 -/* 063490 80062890 0C032424 */ jal func_800C9090 +/* 063490 80062890 0C032424 */ jal alEvtqFlushType /* 063494 80062894 00002825 */ move $a1, $zero /* 063498 80062898 02E02025 */ move $a0, $s7 -/* 06349C 8006289C 0C032424 */ jal func_800C9090 +/* 06349C 8006289C 0C032424 */ jal alEvtqFlushType /* 0634A0 800628A0 24050015 */ li $a1, 21 /* 0634A4 800628A4 02E02025 */ move $a0, $s7 -/* 0634A8 800628A8 0C032424 */ jal func_800C9090 +/* 0634A8 800628A8 0C032424 */ jal alEvtqFlushType /* 0634AC 800628AC 24050002 */ li $a1, 2 /* 0634B0 800628B0 8E510064 */ lw $s1, 0x64($s2) /* 0634B4 800628B4 00000000 */ nop @@ -317,12 +317,12 @@ glabel D_80062408 /* 0634C0 800628C0 26300004 */ addiu $s0, $s1, 4 /* 0634C4 800628C4 02002825 */ move $a1, $s0 /* 0634C8 800628C8 02402025 */ move $a0, $s2 -/* 0634CC 800628CC 0C002B0D */ jal func_8000AC34 +/* 0634CC 800628CC 0C002B0D */ jal __voiceNeedsNoteKill /* 0634D0 800628D0 3406C350 */ li $a2, 50000 /* 0634D4 800628D4 10400004 */ beqz $v0, .L800628E8 /* 0634D8 800628D8 02402025 */ move $a0, $s2 /* 0634DC 800628DC 02002825 */ move $a1, $s0 -/* 0634E0 800628E0 0C002AC0 */ jal func_8000AB00 +/* 0634E0 800628E0 0C002AC0 */ jal __seqpReleaseVoice /* 0634E4 800628E4 3406C350 */ li $a2, 50000 .L800628E8: /* 0634E8 800628E8 8E310000 */ lw $s1, ($s1) @@ -354,13 +354,13 @@ glabel D_80062408 /* 06354C 8006294C AE580018 */ sw $t8, 0x18($s2) /* 063550 80062950 10A00009 */ beqz $a1, .L80062978 /* 063554 80062954 00000000 */ nop -/* 063558 80062958 0C002B38 */ jal func_8000ACE0 +/* 063558 80062958 0C002B38 */ jal __initFromBank /* 06355C 8006295C 02402025 */ move $a0, $s2 /* 063560 80062960 10000006 */ b .L8006297C /* 063564 80062964 8FA50048 */ lw $a1, 0x48($sp) /* 063568 80062968 8E45003C */ lw $a1, 0x3c($s2) /* 06356C 8006296C 02402025 */ move $a0, $s2 -/* 063570 80062970 0C002B38 */ jal func_8000ACE0 +/* 063570 80062970 0C002B38 */ jal __initFromBank /* 063574 80062974 AE450020 */ sw $a1, 0x20($s2) .L80062978: /* 063578 80062978 8FA50048 */ lw $a1, 0x48($sp) diff --git a/asm/non_matchings/unknown_061D30/func_80063A34.s b/asm/non_matchings/unknown_061D30/__setUsptFromTempo.s similarity index 97% rename from asm/non_matchings/unknown_061D30/func_80063A34.s rename to asm/non_matchings/unknown_061D30/__setUsptFromTempo.s index e60b689e..b4612597 100644 --- a/asm/non_matchings/unknown_061D30/func_80063A34.s +++ b/asm/non_matchings/unknown_061D30/__setUsptFromTempo.s @@ -1,4 +1,4 @@ -glabel func_80063A34 +glabel __setUsptFromTempo /* 064634 80063A34 8C820018 */ lw $v0, 0x18($a0) /* 064638 80063A38 44856000 */ mtc1 $a1, $f12 /* 06463C 80063A3C 1040000F */ beqz $v0, .L80063A7C diff --git a/asm/non_matchings/unknown_061D30/func_80062290.s b/asm/non_matchings/unknown_061D30/alCSPNew.s similarity index 90% rename from asm/non_matchings/unknown_061D30/func_80062290.s rename to asm/non_matchings/unknown_061D30/alCSPNew.s index e9ec4db5..7c553734 100644 --- a/asm/non_matchings/unknown_061D30/func_80062290.s +++ b/asm/non_matchings/unknown_061D30/alCSPNew.s @@ -1,4 +1,4 @@ -glabel func_80062290 +glabel alCSPNew /* 062E90 80062290 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 062E94 80062294 AFBF0024 */ sw $ra, 0x24($sp) /* 062E98 80062298 AFB10020 */ sw $s1, 0x20($sp) @@ -6,8 +6,8 @@ glabel func_80062290 /* 062EA0 800622A0 8CA6000C */ lw $a2, 0xc($a1) /* 062EA4 800622A4 AC800020 */ sw $zero, 0x20($a0) /* 062EA8 800622A8 AC800018 */ sw $zero, 0x18($a0) -/* 062EAC 800622AC 3C0E800E */ lui $t6, %hi(D_800E3780) # $t6, 0x800e -/* 062EB0 800622B0 8DCE3780 */ lw $t6, %lo(D_800E3780)($t6) +/* 062EAC 800622AC 3C0E800E */ lui $t6, %hi(alGlobals) # $t6, 0x800e +/* 062EB0 800622B0 8DCE3780 */ lw $t6, %lo(alGlobals)($t6) /* 062EB4 800622B4 340FFFFF */ li $t7, 65535 /* 062EB8 800622B8 241801E8 */ li $t8, 488 /* 062EBC 800622BC 24197FFF */ li $t9, 32767 @@ -81,13 +81,13 @@ glabel func_80062290 /* 062FC4 800623C4 26040048 */ addiu $a0, $s0, 0x48 /* 062FC8 800623C8 0C0324D7 */ jal alEvtqNew /* 062FCC 800623CC 00402825 */ move $a1, $v0 -/* 062FD0 800623D0 3C0B8006 */ lui $t3, %hi(D_80062408) # $t3, 0x8006 -/* 062FD4 800623D4 256B2408 */ addiu $t3, %lo(D_80062408) # addiu $t3, $t3, 0x2408 +/* 062FD0 800623D0 3C0B8006 */ lui $t3, %hi(__CSPVoiceHandler) # $t3, 0x8006 +/* 062FD4 800623D4 256B2408 */ addiu $t3, %lo(__CSPVoiceHandler) # addiu $t3, $t3, 0x2408 /* 062FD8 800623D8 AE000000 */ sw $zero, ($s0) /* 062FDC 800623DC AE0B0008 */ sw $t3, 8($s0) /* 062FE0 800623E0 AE100004 */ sw $s0, 4($s0) -/* 062FE4 800623E4 3C04800E */ lui $a0, %hi(D_800E3780) # $a0, 0x800e -/* 062FE8 800623E8 8C843780 */ lw $a0, %lo(D_800E3780)($a0) +/* 062FE4 800623E4 3C04800E */ lui $a0, %hi(alGlobals) # $a0, 0x800e +/* 062FE8 800623E8 8C843780 */ lw $a0, %lo(alGlobals)($a0) /* 062FEC 800623EC 0C0324F4 */ jal alSynAddPlayer /* 062FF0 800623F0 02002825 */ move $a1, $s0 /* 062FF4 800623F4 8FBF0024 */ lw $ra, 0x24($sp) diff --git a/asm/non_matchings/unknown_064830/func_80064884.s b/asm/non_matchings/unknown_064830/_doModFunc.s similarity index 99% rename from asm/non_matchings/unknown_064830/func_80064884.s rename to asm/non_matchings/unknown_064830/_doModFunc.s index d8420fd1..fa902ff8 100644 --- a/asm/non_matchings/unknown_064830/func_80064884.s +++ b/asm/non_matchings/unknown_064830/_doModFunc.s @@ -1,4 +1,4 @@ -glabel func_80064884 +glabel _doModFunc /* 065484 80064884 44853000 */ mtc1 $a1, $f6 /* 065488 80064888 C4840010 */ lwc1 $f4, 0x10($a0) /* 06548C 8006488C 46803220 */ cvt.s.w $f8, $f6 diff --git a/asm/non_matchings/unknown_064830/func_800647D0.s b/asm/non_matchings/unknown_064830/_filterBuffer.s similarity index 99% rename from asm/non_matchings/unknown_064830/func_800647D0.s rename to asm/non_matchings/unknown_064830/_filterBuffer.s index e2884c70..2a76ae02 100644 --- a/asm/non_matchings/unknown_064830/func_800647D0.s +++ b/asm/non_matchings/unknown_064830/_filterBuffer.s @@ -1,4 +1,4 @@ -glabel func_800647D0 +glabel _filterBuffer /* 0653D0 800647D0 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 0653D4 800647D4 AFB00018 */ sw $s0, 0x18($sp) /* 0653D8 800647D8 AFBF001C */ sw $ra, 0x1c($sp) diff --git a/asm/non_matchings/unknown_064830/func_800644A0.s b/asm/non_matchings/unknown_064830/_loadBuffer.s similarity index 99% rename from asm/non_matchings/unknown_064830/func_800644A0.s rename to asm/non_matchings/unknown_064830/_loadBuffer.s index a44eab87..bd49e065 100644 --- a/asm/non_matchings/unknown_064830/func_800644A0.s +++ b/asm/non_matchings/unknown_064830/_loadBuffer.s @@ -1,4 +1,4 @@ -glabel func_800644A0 +glabel _loadBuffer /* 0650A0 800644A0 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 0650A4 800644A4 AFBF001C */ sw $ra, 0x1c($sp) /* 0650A8 800644A8 AFB00018 */ sw $s0, 0x18($sp) diff --git a/asm/non_matchings/unknown_064830/func_80064224.s b/asm/non_matchings/unknown_064830/_loadOutputBuffer.s similarity index 97% rename from asm/non_matchings/unknown_064830/func_80064224.s rename to asm/non_matchings/unknown_064830/_loadOutputBuffer.s index e488bd18..7d8acda3 100644 --- a/asm/non_matchings/unknown_064830/func_80064224.s +++ b/asm/non_matchings/unknown_064830/_loadOutputBuffer.s @@ -1,4 +1,4 @@ -glabel func_80064224 +glabel _loadOutputBuffer /* 064E24 80064224 27BDFF98 */ addiu $sp, $sp, -0x68 /* 064E28 80064228 AFBF002C */ sw $ra, 0x2c($sp) /* 064E2C 8006422C AFB20028 */ sw $s2, 0x28($sp) @@ -15,7 +15,7 @@ glabel func_80064224 /* 064E58 80064258 00A02025 */ move $a0, $a1 /* 064E5C 8006425C 01F8C823 */ subu $t9, $t7, $t8 /* 064E60 80064260 AFB90040 */ sw $t9, 0x40($sp) -/* 064E64 80064264 0C019221 */ jal func_80064884 +/* 064E64 80064264 0C019221 */ jal _doModFunc /* 064E68 80064268 00E02825 */ move $a1, $a3 /* 064E6C 8006426C 8FAA0040 */ lw $t2, 0x40($sp) /* 064E70 80064270 3C014700 */ li $at, 0x47000000 # 32768.000000 @@ -85,7 +85,7 @@ glabel func_80064224 /* 064F70 80064370 01801825 */ move $v1, $t4 /* 064F74 80064374 010C3821 */ addu $a3, $t0, $t4 /* 064F78 80064378 AFA80034 */ sw $t0, 0x34($sp) -/* 064F7C 8006437C 0C019128 */ jal func_800644A0 +/* 064F7C 8006437C 0C019128 */ jal _loadBuffer /* 064F80 80064380 AFAD0010 */ sw $t5, 0x10($sp) /* 064F84 80064384 8FA90030 */ lw $t1, 0x30($sp) /* 064F88 80064388 3C010800 */ lui $at, 0x800 @@ -149,7 +149,7 @@ glabel func_80064224 /* 06506C 8006446C 8FA60070 */ lw $a2, 0x70($sp) /* 065070 80064470 02403825 */ move $a3, $s2 /* 065074 80064474 AFAD0010 */ sw $t5, 0x10($sp) -/* 065078 80064478 0C019128 */ jal func_800644A0 +/* 065078 80064478 0C019128 */ jal _loadBuffer /* 06507C 8006447C 030A2821 */ addu $a1, $t8, $t2 /* 065080 80064480 00408825 */ move $s1, $v0 .L80064484: diff --git a/asm/non_matchings/unknown_064830/func_80064638.s b/asm/non_matchings/unknown_064830/_saveBuffer.s similarity index 99% rename from asm/non_matchings/unknown_064830/func_80064638.s rename to asm/non_matchings/unknown_064830/_saveBuffer.s index 56878836..be3e1aad 100644 --- a/asm/non_matchings/unknown_064830/func_80064638.s +++ b/asm/non_matchings/unknown_064830/_saveBuffer.s @@ -1,4 +1,4 @@ -glabel func_80064638 +glabel _saveBuffer /* 065238 80064638 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 06523C 8006463C AFBF001C */ sw $ra, 0x1c($sp) /* 065240 80064640 AFB00018 */ sw $s0, 0x18($sp) diff --git a/asm/non_matchings/unknown_064830/func_80064A08.s b/asm/non_matchings/unknown_064830/alFxNew.s similarity index 95% rename from asm/non_matchings/unknown_064830/func_80064A08.s rename to asm/non_matchings/unknown_064830/alFxNew.s index 0aebd3c4..e690b30d 100644 --- a/asm/non_matchings/unknown_064830/func_80064A08.s +++ b/asm/non_matchings/unknown_064830/alFxNew.s @@ -1,4 +1,4 @@ -glabel func_80064A08 +glabel alFxNew /* 065608 80064A08 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 06560C 80064A0C AFB00038 */ sw $s0, 0x38($sp) /* 065610 80064A10 00068400 */ sll $s0, $a2, 0x10 @@ -8,7 +8,7 @@ glabel func_80064A08 /* 065620 80064A20 AFB60050 */ sw $s6, 0x50($sp) /* 065624 80064A24 AFA50064 */ sw $a1, 0x64($sp) /* 065628 80064A28 AFA7006C */ sw $a3, 0x6c($sp) -/* 06562C 80064A2C 3C068006 */ lui $a2, %hi(D_80063F94) # $a2, 0x8006 +/* 06562C 80064A2C 3C068006 */ lui $a2, %hi(alFxParam) # $a2, 0x8006 /* 065630 80064A30 0080B025 */ move $s6, $a0 /* 065634 80064A34 01C08025 */ move $s0, $t6 /* 065638 80064A38 AFBE0058 */ sw $fp, 0x58($sp) @@ -26,15 +26,15 @@ glabel func_80064A08 /* 065668 80064A68 E7B60024 */ swc1 $f22, 0x24($sp) /* 06566C 80064A6C E7B50018 */ swc1 $f21, 0x18($sp) /* 065670 80064A70 E7B4001C */ swc1 $f20, 0x1c($sp) -/* 065674 80064A74 24C63F94 */ addiu $a2, %lo(D_80063F94) # addiu $a2, $a2, 0x3f94 +/* 065674 80064A74 24C63F94 */ addiu $a2, %lo(alFxParam) # addiu $a2, $a2, 0x3f94 /* 065678 80064A78 24070005 */ li $a3, 5 -/* 06567C 80064A7C 0C03282C */ jal func_800CA0B0 +/* 06567C 80064A7C 0C03282C */ jal alFilterNew /* 065680 80064A80 00002825 */ move $a1, $zero /* 065684 80064A84 8FA20064 */ lw $v0, 0x64($sp) -/* 065688 80064A88 3C0F8006 */ lui $t7, %hi(D_80063C30) # $t7, 0x8006 -/* 06568C 80064A8C 3C188006 */ lui $t8, %hi(D_80063FAC) # $t8, 0x8006 -/* 065690 80064A90 25EF3C30 */ addiu $t7, %lo(D_80063C30) # addiu $t7, $t7, 0x3c30 -/* 065694 80064A94 27183FAC */ addiu $t8, %lo(D_80063FAC) # addiu $t8, $t8, 0x3fac +/* 065688 80064A88 3C0F8006 */ lui $t7, %hi(alFxPull) # $t7, 0x8006 +/* 06568C 80064A8C 3C188006 */ lui $t8, %hi(alFxParamHdl) # $t8, 0x8006 +/* 065690 80064A90 25EF3C30 */ addiu $t7, %lo(alFxPull) # addiu $t7, $t7, 0x3c30 +/* 065694 80064A94 27183FAC */ addiu $t8, %lo(alFxParamHdl) # addiu $t8, $t8, 0x3fac /* 065698 80064A98 AECF0004 */ sw $t7, 4($s6) /* 06569C 80064A9C AED80028 */ sw $t8, 0x28($s6) /* 0656A0 80064AA0 0050C821 */ addu $t9, $v0, $s0 @@ -248,7 +248,7 @@ glabel func_80064A08 /* 0659C0 80064DC0 3239FFFF */ andi $t9, $s1, 0xffff /* 0659C4 80064DC4 A70F0000 */ sh $t7, ($t8) /* 0659C8 80064DC8 8E040020 */ lw $a0, 0x20($s0) -/* 0659CC 80064DCC 0C019254 */ jal func_80064950 +/* 0659CC 80064DCC 0C019254 */ jal init_lpfilter /* 0659D0 80064DD0 03208825 */ move $s1, $t9 /* 0659D4 80064DD4 10000006 */ b .L80064DF0 /* 0659D8 80064DD8 92CA0024 */ lbu $t2, 0x24($s6) diff --git a/asm/non_matchings/unknown_064830/D_80063FAC.s b/asm/non_matchings/unknown_064830/alFxParamHdl.s similarity index 97% rename from asm/non_matchings/unknown_064830/D_80063FAC.s rename to asm/non_matchings/unknown_064830/alFxParamHdl.s index fcea7f0b..9519152d 100644 --- a/asm/non_matchings/unknown_064830/D_80063FAC.s +++ b/asm/non_matchings/unknown_064830/alFxParamHdl.s @@ -1,4 +1,4 @@ -glabel D_80063FAC +glabel alFxParamHdl /* 064BAC 80063FAC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 064BB0 80063FB0 24A3FFFE */ addiu $v1, $a1, -2 /* 064BB4 80063FB4 AFBF0014 */ sw $ra, 0x14($sp) @@ -82,9 +82,9 @@ glabel D_80063FAC /* 064CD8 800640D8 3C01447A */ li $at, 0x447A0000 # 1000.000000 /* 064CDC 800640DC 468021A0 */ cvt.s.w $f6, $f4 /* 064CE0 800640E0 44814000 */ mtc1 $at, $f8 -/* 064CE4 800640E4 3C0A800E */ lui $t2, %hi(D_800E3780) # $t2, 0x800e +/* 064CE4 800640E4 3C0A800E */ lui $t2, %hi(alGlobals) # $t2, 0x800e /* 064CE8 800640E8 46083283 */ div.s $f10, $f6, $f8 -/* 064CEC 800640EC 8D4A3780 */ lw $t2, %lo(D_800E3780)($t2) +/* 064CEC 800640EC 8D4A3780 */ lw $t2, %lo(alGlobals)($t2) /* 064CF0 800640F0 8CED0020 */ lw $t5, 0x20($a3) /* 064CF4 800640F4 8D4C0044 */ lw $t4, 0x44($t2) /* 064CF8 800640F8 00000000 */ nop @@ -160,7 +160,7 @@ glabel D_80063FAC /* 064E00 80064200 00000000 */ nop /* 064E04 80064204 030DC821 */ addu $t9, $t8, $t5 /* 064E08 80064208 8F240020 */ lw $a0, 0x20($t9) -/* 064E0C 8006420C 0C019254 */ jal func_80064950 +/* 064E0C 8006420C 0C019254 */ jal init_lpfilter /* 064E10 80064210 00000000 */ nop .L80064214: /* 064E14 80064214 8FBF0014 */ lw $ra, 0x14($sp) diff --git a/asm/non_matchings/unknown_064830/D_80063C30.s b/asm/non_matchings/unknown_064830/alFxPull.s similarity index 96% rename from asm/non_matchings/unknown_064830/D_80063C30.s rename to asm/non_matchings/unknown_064830/alFxPull.s index f58fea2f..456dd2d2 100644 --- a/asm/non_matchings/unknown_064830/D_80063C30.s +++ b/asm/non_matchings/unknown_064830/alFxPull.s @@ -1,4 +1,4 @@ -glabel D_80063C30 +glabel alFxPull /* 064830 80063C30 27BDFF60 */ addiu $sp, $sp, -0xa0 /* 064834 80063C34 AFB3002C */ sw $s3, 0x2c($sp) /* 064838 80063C38 00809825 */ move $s3, $a0 @@ -57,7 +57,7 @@ glabel D_80063C30 /* 064908 80063D08 AFA3007C */ sw $v1, 0x7c($sp) /* 06490C 80063D0C 02602025 */ move $a0, $s3 /* 064910 80063D10 240606C0 */ li $a2, 1728 -/* 064914 80063D14 0C01918E */ jal func_80064638 +/* 064914 80063D14 0C01918E */ jal _saveBuffer /* 064918 80063D18 02C03825 */ move $a3, $s6 /* 06491C 80063D1C 8FA3007C */ lw $v1, 0x7c($sp) /* 064920 80063D20 3C0F0200 */ lui $t7, (0x02000800 >> 16) # lui $t7, 0x200 @@ -98,7 +98,7 @@ glabel D_80063C30 /* 0649A4 80063DA4 02802825 */ move $a1, $s4 /* 0649A8 80063DA8 02A03025 */ move $a2, $s5 /* 0649AC 80063DAC 02C03825 */ move $a3, $s6 -/* 0649B0 80063DB0 0C019128 */ jal func_800644A0 +/* 0649B0 80063DB0 0C019128 */ jal _loadBuffer /* 0649B4 80063DB4 AFB00010 */ sw $s0, 0x10($sp) /* 0649B8 80063DB8 00408025 */ move $s0, $v0 .L80063DBC: @@ -106,7 +106,7 @@ glabel D_80063C30 /* 0649C0 80063DC0 02202825 */ move $a1, $s1 /* 0649C4 80063DC4 02403025 */ move $a2, $s2 /* 0649C8 80063DC8 02C03825 */ move $a3, $s6 -/* 0649CC 80063DCC 0C019089 */ jal func_80064224 +/* 0649CC 80063DCC 0C019089 */ jal _loadOutputBuffer /* 0649D0 80063DD0 AFB00010 */ sw $s0, 0x10($sp) /* 0649D4 80063DD4 86240008 */ lh $a0, 8($s1) /* 0649D8 80063DD8 00408025 */ move $s0, $v0 @@ -129,7 +129,7 @@ glabel D_80063C30 /* 064A1C 80063E1C 03C02825 */ move $a1, $fp /* 064A20 80063E20 02403025 */ move $a2, $s2 /* 064A24 80063E24 02C03825 */ move $a3, $s6 -/* 064A28 80063E28 0C01918E */ jal func_80064638 +/* 064A28 80063E28 0C01918E */ jal _saveBuffer /* 064A2C 80063E2C AFB00010 */ sw $s0, 0x10($sp) /* 064A30 80063E30 00408025 */ move $s0, $v0 .L80063E34: @@ -149,7 +149,7 @@ glabel D_80063C30 /* 064A68 80063E68 02602025 */ move $a0, $s3 /* 064A6C 80063E6C 02802825 */ move $a1, $s4 /* 064A70 80063E70 02A03025 */ move $a2, $s5 -/* 064A74 80063E74 0C01918E */ jal func_80064638 +/* 064A74 80063E74 0C01918E */ jal _saveBuffer /* 064A78 80063E78 02C03825 */ move $a3, $s6 /* 064A7C 80063E7C 00408025 */ move $s0, $v0 .L80063E80: @@ -157,7 +157,7 @@ glabel D_80063C30 /* 064A84 80063E84 02402825 */ move $a1, $s2 /* 064A88 80063E88 10800004 */ beqz $a0, .L80063E9C /* 064A8C 80063E8C 02C03025 */ move $a2, $s6 -/* 064A90 80063E90 0C0191F4 */ jal func_800647D0 +/* 064A90 80063E90 0C0191F4 */ jal _filterBuffer /* 064A94 80063E94 02003825 */ move $a3, $s0 /* 064A98 80063E98 00408025 */ move $s0, $v0 .L80063E9C: @@ -167,7 +167,7 @@ glabel D_80063C30 /* 064AA8 80063EA8 03C02825 */ move $a1, $fp /* 064AAC 80063EAC 02403025 */ move $a2, $s2 /* 064AB0 80063EB0 02C03825 */ move $a3, $s6 -/* 064AB4 80063EB4 0C01918E */ jal func_80064638 +/* 064AB4 80063EB4 0C01918E */ jal _saveBuffer /* 064AB8 80063EB8 AFB00010 */ sw $s0, 0x10($sp) /* 064ABC 80063EBC 00408025 */ move $s0, $v0 .L80063EC0: diff --git a/asm/non_matchings/unknown_064830/func_80064950.s b/asm/non_matchings/unknown_064830/init_lpfilter.s similarity index 99% rename from asm/non_matchings/unknown_064830/func_80064950.s rename to asm/non_matchings/unknown_064830/init_lpfilter.s index 650d0ee4..432f8fc0 100644 --- a/asm/non_matchings/unknown_064830/func_80064950.s +++ b/asm/non_matchings/unknown_064830/init_lpfilter.s @@ -1,4 +1,4 @@ -glabel func_80064950 +glabel init_lpfilter /* 065550 80064950 84820000 */ lh $v0, ($a0) /* 065554 80064954 24194000 */ li $t9, 16384 /* 065558 80064958 00027380 */ sll $t6, $v0, 0xe diff --git a/asm/non_matchings/unknown_065D30/func_80065668.s b/asm/non_matchings/unknown_065D30/__allocParam.s similarity index 77% rename from asm/non_matchings/unknown_065D30/func_80065668.s rename to asm/non_matchings/unknown_065D30/__allocParam.s index 17416ce8..096cc1d7 100644 --- a/asm/non_matchings/unknown_065D30/func_80065668.s +++ b/asm/non_matchings/unknown_065D30/__allocParam.s @@ -1,6 +1,6 @@ -glabel func_80065668 -/* 066268 80065668 3C02800E */ lui $v0, %hi(D_800E3780) # $v0, 0x800e -/* 06626C 8006566C 8C423780 */ lw $v0, %lo(D_800E3780)($v0) +glabel __allocParam +/* 066268 80065668 3C02800E */ lui $v0, %hi(alGlobals) # $v0, 0x800e +/* 06626C 8006566C 8C423780 */ lw $v0, %lo(alGlobals)($v0) /* 066270 80065670 00001825 */ move $v1, $zero /* 066274 80065674 8C44002C */ lw $a0, 0x2c($v0) /* 066278 80065678 00000000 */ nop diff --git a/asm/non_matchings/unknown_065D30/func_800656BC.s b/asm/non_matchings/unknown_065D30/__collectPVoices.s similarity index 98% rename from asm/non_matchings/unknown_065D30/func_800656BC.s rename to asm/non_matchings/unknown_065D30/__collectPVoices.s index 3b17c5ec..e43cb395 100644 --- a/asm/non_matchings/unknown_065D30/func_800656BC.s +++ b/asm/non_matchings/unknown_065D30/__collectPVoices.s @@ -1,4 +1,4 @@ -glabel func_800656BC +glabel __collectPVoices /* 0662BC 800656BC 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 0662C0 800656C0 AFBF0024 */ sw $ra, 0x24($sp) /* 0662C4 800656C4 AFB20020 */ sw $s2, 0x20($sp) diff --git a/asm/non_matchings/unknown_065D30/func_8006571C.s b/asm/non_matchings/unknown_065D30/__freePVoices.s similarity index 97% rename from asm/non_matchings/unknown_065D30/func_8006571C.s rename to asm/non_matchings/unknown_065D30/__freePVoices.s index eb370e19..1e2d0855 100644 --- a/asm/non_matchings/unknown_065D30/func_8006571C.s +++ b/asm/non_matchings/unknown_065D30/__freePVoices.s @@ -1,4 +1,4 @@ -glabel func_8006571C +glabel __freePVoices /* 06631C 8006571C 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 066320 80065720 AFBF0014 */ sw $ra, 0x14($sp) /* 066324 80065724 AFA40018 */ sw $a0, 0x18($sp) diff --git a/asm/non_matchings/unknown_065D30/func_8006569C.s b/asm/non_matchings/unknown_065D30/__freeParam.s similarity index 63% rename from asm/non_matchings/unknown_065D30/func_8006569C.s rename to asm/non_matchings/unknown_065D30/__freeParam.s index 8d73da97..d3c77f41 100644 --- a/asm/non_matchings/unknown_065D30/func_8006569C.s +++ b/asm/non_matchings/unknown_065D30/__freeParam.s @@ -1,6 +1,6 @@ -glabel func_8006569C -/* 06629C 8006569C 3C02800E */ lui $v0, %hi(D_800E3780) # $v0, 0x800e -/* 0662A0 800656A0 8C423780 */ lw $v0, %lo(D_800E3780)($v0) +glabel __freeParam +/* 06629C 8006569C 3C02800E */ lui $v0, %hi(alGlobals) # $v0, 0x800e +/* 0662A0 800656A0 8C423780 */ lw $v0, %lo(alGlobals)($v0) /* 0662A4 800656A4 00000000 */ nop /* 0662A8 800656A8 8C4E002C */ lw $t6, 0x2c($v0) /* 0662AC 800656AC 00000000 */ nop diff --git a/asm/non_matchings/unknown_065D30/func_800657EC.s b/asm/non_matchings/unknown_065D30/__nextSampleTime.s similarity index 98% rename from asm/non_matchings/unknown_065D30/func_800657EC.s rename to asm/non_matchings/unknown_065D30/__nextSampleTime.s index b1c08b13..3567a321 100644 --- a/asm/non_matchings/unknown_065D30/func_800657EC.s +++ b/asm/non_matchings/unknown_065D30/__nextSampleTime.s @@ -1,4 +1,4 @@ -glabel func_800657EC +glabel __nextSampleTime /* 0663EC 800657EC ACA00000 */ sw $zero, ($a1) /* 0663F0 800657F0 8C830000 */ lw $v1, ($a0) /* 0663F4 800657F4 3C027FFF */ lui $v0, (0x7FFFFFFF >> 16) # lui $v0, 0x7fff diff --git a/asm/non_matchings/unknown_065D30/func_800657C4.s b/asm/non_matchings/unknown_065D30/__timeToSamples.s similarity index 84% rename from asm/non_matchings/unknown_065D30/func_800657C4.s rename to asm/non_matchings/unknown_065D30/__timeToSamples.s index 9d438e06..2a142dc4 100644 --- a/asm/non_matchings/unknown_065D30/func_800657C4.s +++ b/asm/non_matchings/unknown_065D30/__timeToSamples.s @@ -1,7 +1,7 @@ -glabel func_800657C4 +glabel __timeToSamples /* 0663C4 800657C4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0663C8 800657C8 AFBF0014 */ sw $ra, 0x14($sp) -/* 0663CC 800657CC 0C0195D5 */ jal func_80065754 +/* 0663CC 800657CC 0C0195D5 */ jal __timeToSamplesNoRound /* 0663D0 800657D0 00000000 */ nop /* 0663D4 800657D4 8FBF0014 */ lw $ra, 0x14($sp) /* 0663D8 800657D8 2401FFF0 */ li $at, -16 diff --git a/asm/non_matchings/unknown_065D30/func_80065754.s b/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s similarity index 97% rename from asm/non_matchings/unknown_065D30/func_80065754.s rename to asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s index 28a72802..bf5dba42 100644 --- a/asm/non_matchings/unknown_065D30/func_80065754.s +++ b/asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s @@ -1,4 +1,4 @@ -glabel func_80065754 +glabel __timeToSamplesNoRound /* 066354 80065754 8C8E0044 */ lw $t6, 0x44($a0) /* 066358 80065758 44852000 */ mtc1 $a1, $f4 /* 06635C 8006575C 448E4000 */ mtc1 $t6, $f8 diff --git a/asm/non_matchings/unknown_065D30/func_80065494.s b/asm/non_matchings/unknown_065D30/alAudioFrame.s similarity index 93% rename from asm/non_matchings/unknown_065D30/func_80065494.s rename to asm/non_matchings/unknown_065D30/alAudioFrame.s index 0717b5ed..d5a72ed5 100644 --- a/asm/non_matchings/unknown_065D30/func_80065494.s +++ b/asm/non_matchings/unknown_065D30/alAudioFrame.s @@ -1,8 +1,8 @@ -glabel func_80065494 +glabel alAudioFrame /* 066094 80065494 27BDFF90 */ addiu $sp, $sp, -0x70 /* 066098 80065498 AFB20024 */ sw $s2, 0x24($sp) -/* 06609C 8006549C 3C12800E */ lui $s2, %hi(D_800E3780) # $s2, 0x800e -/* 0660A0 800654A0 8E523780 */ lw $s2, %lo(D_800E3780)($s2) +/* 06609C 8006549C 3C12800E */ lui $s2, %hi(alGlobals) # $s2, 0x800e +/* 0660A0 800654A0 8E523780 */ lw $s2, %lo(alGlobals)($s2) /* 0660A4 800654A4 AFBF003C */ sw $ra, 0x3c($sp) /* 0660A8 800654A8 AFB70038 */ sw $s7, 0x38($sp) /* 0660AC 800654AC AFB60034 */ sw $s6, 0x34($sp) @@ -26,7 +26,7 @@ glabel func_80065494 /* 0660F0 800654F0 27B0006C */ addiu $s0, $sp, 0x6c /* 0660F4 800654F4 02002825 */ move $a1, $s0 /* 0660F8 800654F8 02402025 */ move $a0, $s2 -/* 0660FC 800654FC 0C0195FB */ jal func_800657EC +/* 0660FC 800654FC 0C0195FB */ jal __nextSampleTime /* 066100 80065500 AFB10070 */ sw $s1, 0x70($sp) /* 066104 80065504 8E580020 */ lw $t8, 0x20($s2) /* 066108 80065508 AE42001C */ sw $v0, 0x1c($s2) @@ -46,14 +46,14 @@ glabel func_80065494 /* 06613C 8006553C 0320F809 */ jalr $t9 /* 066140 80065540 00000000 */ nop /* 066144 80065544 02402025 */ move $a0, $s2 -/* 066148 80065548 0C0195D5 */ jal func_80065754 +/* 066148 80065548 0C0195D5 */ jal __timeToSamplesNoRound /* 06614C 8006554C 00402825 */ move $a1, $v0 /* 066150 80065550 8FAB006C */ lw $t3, 0x6c($sp) /* 066154 80065554 02402025 */ move $a0, $s2 /* 066158 80065558 8D6C0010 */ lw $t4, 0x10($t3) /* 06615C 8006555C 02002825 */ move $a1, $s0 /* 066160 80065560 01826821 */ addu $t5, $t4, $v0 -/* 066164 80065564 0C0195FB */ jal func_800657EC +/* 066164 80065564 0C0195FB */ jal __nextSampleTime /* 066168 80065568 AD6D0010 */ sw $t5, 0x10($t3) /* 06616C 8006556C 8E4E0020 */ lw $t6, 0x20($s2) /* 066170 80065570 AE42001C */ sw $v0, 0x1c($s2) @@ -108,7 +108,7 @@ glabel func_80065494 /* 066224 80065624 028E7823 */ subu $t7, $s4, $t6 /* 066228 80065628 000FC0C3 */ sra $t8, $t7, 3 /* 06622C 8006562C 02402025 */ move $a0, $s2 -/* 066230 80065630 0C0195AF */ jal func_800656BC +/* 066230 80065630 0C0195AF */ jal __collectPVoices /* 066234 80065634 AD180000 */ sw $t8, ($t0) /* 066238 80065638 02801025 */ move $v0, $s4 .L8006563C: diff --git a/asm/non_matchings/unknown_065D30/alSynNew.s b/asm/non_matchings/unknown_065D30/alSynNew.s index 463bd294..b266a0b0 100644 --- a/asm/non_matchings/unknown_065D30/alSynNew.s +++ b/asm/non_matchings/unknown_065D30/alSynNew.s @@ -99,7 +99,7 @@ glabel alSynNew /* 065EB0 800652B0 0005CC03 */ sra $t9, $a1, 0x10 /* 065EB4 800652B4 03202825 */ move $a1, $t9 /* 065EB8 800652B8 03C03025 */ move $a2, $fp -/* 065EBC 800652BC 0C019618 */ jal func_80065860 +/* 065EBC 800652BC 0C019618 */ jal alSynAllocFX /* 065EC0 800652C0 02E03825 */ move $a3, $s7 /* 065EC4 800652C4 1000000A */ b .L800652F0 /* 065EC8 800652C8 26100001 */ addiu $s0, $s0, 1 @@ -110,7 +110,7 @@ glabel alSynNew /* 065ED8 800652D8 24050002 */ li $a1, 2 /* 065EDC 800652DC 00004812 */ mflo $t1 /* 065EE0 800652E0 01093021 */ addu $a2, $t0, $t1 -/* 065EE4 800652E4 0C0330E4 */ jal D_800CC390 +/* 065EE4 800652E4 0C0330E4 */ jal alMainBusParam /* 065EE8 800652E8 00000000 */ nop /* 065EEC 800652EC 26100001 */ addiu $s0, $s0, 1 .L800652F0: diff --git a/asm/non_matchings/unknown_066460/func_80065860.s b/asm/non_matchings/unknown_066460/alSynAllocFX.s similarity index 91% rename from asm/non_matchings/unknown_066460/func_80065860.s rename to asm/non_matchings/unknown_066460/alSynAllocFX.s index faf7683e..86452f31 100644 --- a/asm/non_matchings/unknown_066460/func_80065860.s +++ b/asm/non_matchings/unknown_066460/alSynAllocFX.s @@ -1,4 +1,4 @@ -glabel func_80065860 +glabel alSynAllocFX /* 066460 80065860 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 066464 80065864 AFA50024 */ sw $a1, 0x24($sp) /* 066468 80065868 AFA60028 */ sw $a2, 0x28($sp) @@ -15,18 +15,18 @@ glabel func_80065860 /* 066494 80065894 00118880 */ sll $s1, $s1, 2 /* 066498 80065898 8FA50028 */ lw $a1, 0x28($sp) /* 06649C 8006589C 01D12021 */ addu $a0, $t6, $s1 -/* 0664A0 800658A0 0C019282 */ jal func_80064A08 +/* 0664A0 800658A0 0C019282 */ jal alFxNew /* 0664A4 800658A4 24840020 */ addiu $a0, $a0, 0x20 /* 0664A8 800658A8 8E0F0034 */ lw $t7, 0x34($s0) /* 0664AC 800658AC 24050001 */ li $a1, 1 /* 0664B0 800658B0 01F13021 */ addu $a2, $t7, $s1 -/* 0664B4 800658B4 0C018FE5 */ jal D_80063F94 +/* 0664B4 800658B4 0C018FE5 */ jal alFxParam /* 0664B8 800658B8 24C40020 */ addiu $a0, $a2, 0x20 /* 0664BC 800658BC 8E180034 */ lw $t8, 0x34($s0) /* 0664C0 800658C0 8E040030 */ lw $a0, 0x30($s0) /* 0664C4 800658C4 03113021 */ addu $a2, $t8, $s1 /* 0664C8 800658C8 24C60020 */ addiu $a2, $a2, 0x20 -/* 0664CC 800658CC 0C0330E4 */ jal D_800CC390 +/* 0664CC 800658CC 0C0330E4 */ jal alMainBusParam /* 0664D0 800658D0 24050002 */ li $a1, 2 /* 0664D4 800658D4 8E190034 */ lw $t9, 0x34($s0) /* 0664D8 800658D8 8FBF001C */ lw $ra, 0x1c($sp) diff --git a/asm/non_matchings/unknown_066500/D_80065900.s b/asm/non_matchings/unknown_066500/alAuxBusPull.s similarity index 99% rename from asm/non_matchings/unknown_066500/D_80065900.s rename to asm/non_matchings/unknown_066500/alAuxBusPull.s index 11427a8e..5479817b 100644 --- a/asm/non_matchings/unknown_066500/D_80065900.s +++ b/asm/non_matchings/unknown_066500/alAuxBusPull.s @@ -1,4 +1,4 @@ -glabel D_80065900 +glabel alAuxBusPull /* 066500 80065900 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 066504 80065904 AFB10024 */ sw $s1, 0x24($sp) /* 066508 80065908 8FB10050 */ lw $s1, 0x50($sp) diff --git a/asm/non_matchings/unknown_066500/func_80065B20.s b/asm/non_matchings/unknown_066500/alSynSetPan.s similarity index 96% rename from asm/non_matchings/unknown_066500/func_80065B20.s rename to asm/non_matchings/unknown_066500/alSynSetPan.s index 4e7bc375..91652705 100644 --- a/asm/non_matchings/unknown_066500/func_80065B20.s +++ b/asm/non_matchings/unknown_066500/alSynSetPan.s @@ -1,4 +1,4 @@ -glabel func_80065B20 +glabel alSynSetPan /* 066720 80065B20 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 066724 80065B24 AFBF0014 */ sw $ra, 0x14($sp) /* 066728 80065B28 AFA40020 */ sw $a0, 0x20($sp) @@ -8,7 +8,7 @@ glabel func_80065B20 /* 066738 80065B38 00000000 */ nop /* 06673C 80065B3C 11E0001F */ beqz $t7, .L80065BBC /* 066740 80065B40 8FBF0014 */ lw $ra, 0x14($sp) -/* 066744 80065B44 0C01959A */ jal func_80065668 +/* 066744 80065B44 0C01959A */ jal __allocParam /* 066748 80065B48 00000000 */ nop /* 06674C 80065B4C 1040001A */ beqz $v0, .L80065BB8 /* 066750 80065B50 240C000C */ li $t4, 12 diff --git a/asm/non_matchings/unknown_0667D0/func_80065C38.s b/asm/non_matchings/unknown_0667D0/alSynStartVoiceParams.s similarity index 93% rename from asm/non_matchings/unknown_0667D0/func_80065C38.s rename to asm/non_matchings/unknown_0667D0/alSynStartVoiceParams.s index ae821636..100a6b6a 100644 --- a/asm/non_matchings/unknown_0667D0/func_80065C38.s +++ b/asm/non_matchings/unknown_0667D0/alSynStartVoiceParams.s @@ -1,4 +1,4 @@ -glabel func_80065C38 +glabel alSynStartVoiceParams /* 066838 80065C38 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 06683C 80065C3C AFBF0014 */ sw $ra, 0x14($sp) /* 066840 80065C40 AFA40020 */ sw $a0, 0x20($sp) @@ -9,7 +9,7 @@ glabel func_80065C38 /* 066854 80065C54 00000000 */ nop /* 066858 80065C58 11E00036 */ beqz $t7, .L80065D34 /* 06685C 80065C5C 8FBF0014 */ lw $ra, 0x14($sp) -/* 066860 80065C60 0C01959A */ jal func_80065668 +/* 066860 80065C60 0C01959A */ jal __allocParam /* 066864 80065C64 00000000 */ nop /* 066868 80065C68 10400031 */ beqz $v0, .L80065D30 /* 06686C 80065C6C 00403025 */ move $a2, $v0 @@ -43,7 +43,7 @@ glabel func_80065C38 /* 0668DC 80065CDC E4C4000C */ swc1 $f4, 0xc($a2) /* 0668E0 80065CE0 8FA5003C */ lw $a1, 0x3c($sp) /* 0668E4 80065CE4 8FA40020 */ lw $a0, 0x20($sp) -/* 0668E8 80065CE8 0C0195F1 */ jal func_800657C4 +/* 0668E8 80065CE8 0C0195F1 */ jal __timeToSamples /* 0668EC 80065CEC 00000000 */ nop /* 0668F0 80065CF0 8FA6001C */ lw $a2, 0x1c($sp) /* 0668F4 80065CF4 24050003 */ li $a1, 3 diff --git a/data/dkr.data.s b/data/dkr.data.s index b7d1503d..277a6d90 100644 --- a/data/dkr.data.s +++ b/data/dkr.data.s @@ -8120,7 +8120,7 @@ glabel D_800E3778 glabel D_800E377C .word 0x00000000 -glabel D_800E3780 +glabel alGlobals .word 0x00000000 .word 0x00000000 .word 0x00000000 diff --git a/lib/asm/non_matchings/unknown_0C86A0/func_800C7D04.s b/lib/asm/non_matchings/unknown_0C86A0/__alCSeqGetTrackEvent.s similarity index 93% rename from lib/asm/non_matchings/unknown_0C86A0/func_800C7D04.s rename to lib/asm/non_matchings/unknown_0C86A0/__alCSeqGetTrackEvent.s index d01e737d..d77492ca 100644 --- a/lib/asm/non_matchings/unknown_0C86A0/func_800C7D04.s +++ b/lib/asm/non_matchings/unknown_0C86A0/__alCSeqGetTrackEvent.s @@ -1,4 +1,4 @@ -glabel func_800C7D04 +glabel __alCSeqGetTrackEvent /* 0C8904 800C7D04 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 0C8908 800C7D08 AFB00018 */ sw $s0, 0x18($sp) /* 0C890C 800C7D0C 00A08025 */ move $s0, $a1 @@ -35,14 +35,14 @@ glabel func_800C7D04 /* 0C897C 800C7D7C 5445FFEC */ bnel $v0, $a1, .L800C7D30 /* 0C8980 800C7D80 8D8E0004 */ lw $t6, 4($t4) /* 0C8984 800C7D84 01802025 */ move $a0, $t4 -/* 0C8988 800C7D88 0C031EF8 */ jal func_800C7BE0 +/* 0C8988 800C7D88 0C031EF8 */ jal __getTrackByte /* 0C898C 800C7D8C 01602825 */ move $a1, $t3 /* 0C8990 800C7D90 240100FF */ li $at, 255 /* 0C8994 800C7D94 304A00FF */ andi $t2, $v0, 0xff /* 0C8998 800C7D98 1441005A */ bne $v0, $at, .L800C7F04 /* 0C899C 800C7D9C 00401825 */ move $v1, $v0 /* 0C89A0 800C7DA0 01802025 */ move $a0, $t4 -/* 0C89A4 800C7DA4 0C031EF8 */ jal func_800C7BE0 +/* 0C89A4 800C7DA4 0C031EF8 */ jal __getTrackByte /* 0C89A8 800C7DA8 01602825 */ move $a1, $t3 /* 0C89AC 800C7DAC 24010051 */ li $at, 81 /* 0C89B0 800C7DB0 304600FF */ andi $a2, $v0, 0xff @@ -53,15 +53,15 @@ glabel func_800C7D04 /* 0C89C4 800C7DC4 A20A0008 */ sb $t2, 8($s0) /* 0C89C8 800C7DC8 A2060009 */ sb $a2, 9($s0) /* 0C89CC 800C7DCC 01802025 */ move $a0, $t4 -/* 0C89D0 800C7DD0 0C031EF8 */ jal func_800C7BE0 +/* 0C89D0 800C7DD0 0C031EF8 */ jal __getTrackByte /* 0C89D4 800C7DD4 01602825 */ move $a1, $t3 /* 0C89D8 800C7DD8 A202000B */ sb $v0, 0xb($s0) /* 0C89DC 800C7DDC 01802025 */ move $a0, $t4 -/* 0C89E0 800C7DE0 0C031EF8 */ jal func_800C7BE0 +/* 0C89E0 800C7DE0 0C031EF8 */ jal __getTrackByte /* 0C89E4 800C7DE4 01602825 */ move $a1, $t3 /* 0C89E8 800C7DE8 A202000C */ sb $v0, 0xc($s0) /* 0C89EC 800C7DEC 01802025 */ move $a0, $t4 -/* 0C89F0 800C7DF0 0C031EF8 */ jal func_800C7BE0 +/* 0C89F0 800C7DF0 0C031EF8 */ jal __getTrackByte /* 0C89F4 800C7DF4 01602825 */ move $a1, $t3 /* 0C89F8 800C7DF8 A202000D */ sb $v0, 0xd($s0) /* 0C89FC 800C7DFC 018B7021 */ addu $t6, $t4, $t3 @@ -88,10 +88,10 @@ glabel func_800C7D04 .L800C7E48: /* 0C8A48 800C7E48 1461000B */ bne $v1, $at, .L800C7E78 /* 0C8A4C 800C7E4C 01802025 */ move $a0, $t4 -/* 0C8A50 800C7E50 0C031EF8 */ jal func_800C7BE0 +/* 0C8A50 800C7E50 0C031EF8 */ jal __getTrackByte /* 0C8A54 800C7E54 01602825 */ move $a1, $t3 /* 0C8A58 800C7E58 01802025 */ move $a0, $t4 -/* 0C8A5C 800C7E5C 0C031EF8 */ jal func_800C7BE0 +/* 0C8A5C 800C7E5C 0C031EF8 */ jal __getTrackByte /* 0C8A60 800C7E60 01602825 */ move $a1, $t3 /* 0C8A64 800C7E64 018B7021 */ addu $t6, $t4, $t3 /* 0C8A68 800C7E68 A1C000A8 */ sb $zero, 0xa8($t6) @@ -144,7 +144,7 @@ glabel func_800C7D04 /* 0C8B10 800C7F10 A60F0000 */ sh $t7, ($s0) /* 0C8B14 800C7F14 A20A0008 */ sb $t2, 8($s0) /* 0C8B18 800C7F18 01802025 */ move $a0, $t4 -/* 0C8B1C 800C7F1C 0C031EF8 */ jal func_800C7BE0 +/* 0C8B1C 800C7F1C 0C031EF8 */ jal __getTrackByte /* 0C8B20 800C7F20 01602825 */ move $a1, $t3 /* 0C8B24 800C7F24 A2020009 */ sb $v0, 9($s0) /* 0C8B28 800C7F28 018B7021 */ addu $t6, $t4, $t3 @@ -163,7 +163,7 @@ glabel func_800C7D04 /* 0C8B54 800C7F54 240100D0 */ li $at, 208 /* 0C8B58 800C7F58 13210010 */ beq $t9, $at, .L800C7F9C /* 0C8B5C 800C7F5C 01802025 */ move $a0, $t4 -/* 0C8B60 800C7F60 0C031EF8 */ jal func_800C7BE0 +/* 0C8B60 800C7F60 0C031EF8 */ jal __getTrackByte /* 0C8B64 800C7F64 01602825 */ move $a1, $t3 /* 0C8B68 800C7F68 920E0008 */ lbu $t6, 8($s0) /* 0C8B6C 800C7F6C 24010090 */ li $at, 144 @@ -172,7 +172,7 @@ glabel func_800C7D04 /* 0C8B78 800C7F78 17010009 */ bne $t8, $at, .L800C7FA0 /* 0C8B7C 800C7F7C 01805025 */ move $t2, $t4 /* 0C8B80 800C7F80 AFA90028 */ sw $t1, 0x28($sp) -/* 0C8B84 800C7F84 0C031F29 */ jal func_800C7CA4 +/* 0C8B84 800C7F84 0C031F29 */ jal __readVarLen /* 0C8B88 800C7F88 AFAB0024 */ sw $t3, 0x24($sp) /* 0C8B8C 800C7F8C 8FA90028 */ lw $t1, 0x28($sp) /* 0C8B90 800C7F90 8FAB0024 */ lw $t3, 0x24($sp) @@ -192,7 +192,7 @@ glabel func_800C7D04 /* 0C8BC0 800C7FC0 000BC080 */ sll $t8, $t3, 2 /* 0C8BC4 800C7FC4 51C10007 */ beql $t6, $at, .L800C7FE4 /* 0C8BC8 800C7FC8 240E0001 */ li $t6, 1 -/* 0C8BCC 800C7FCC 0C031F29 */ jal func_800C7CA4 +/* 0C8BCC 800C7FCC 0C031F29 */ jal __readVarLen /* 0C8BD0 800C7FD0 01986821 */ addu $t5, $t4, $t8 /* 0C8BD4 800C7FD4 8DAF00B8 */ lw $t7, 0xb8($t5) /* 0C8BD8 800C7FD8 01E2C821 */ addu $t9, $t7, $v0 diff --git a/lib/asm/non_matchings/unknown_0C86A0/func_800C83EC.s b/lib/asm/non_matchings/unknown_0C86A0/__alCSeqNextDelta.s similarity index 99% rename from lib/asm/non_matchings/unknown_0C86A0/func_800C83EC.s rename to lib/asm/non_matchings/unknown_0C86A0/__alCSeqNextDelta.s index a8c10ee2..f0516ee5 100644 --- a/lib/asm/non_matchings/unknown_0C86A0/func_800C83EC.s +++ b/lib/asm/non_matchings/unknown_0C86A0/__alCSeqNextDelta.s @@ -1,4 +1,4 @@ -glabel func_800C83EC +glabel __alCSeqNextDelta /* 0C8FEC 800C83EC 8C8E0004 */ lw $t6, 4($a0) /* 0C8FF0 800C83F0 00A04825 */ move $t1, $a1 /* 0C8FF4 800C83F4 2403FFFF */ li $v1, -1 diff --git a/lib/asm/non_matchings/unknown_0C86A0/func_800C7BE0.s b/lib/asm/non_matchings/unknown_0C86A0/__getTrackByte.s similarity index 99% rename from lib/asm/non_matchings/unknown_0C86A0/func_800C7BE0.s rename to lib/asm/non_matchings/unknown_0C86A0/__getTrackByte.s index d7b2a9f4..b36e43b5 100644 --- a/lib/asm/non_matchings/unknown_0C86A0/func_800C7BE0.s +++ b/lib/asm/non_matchings/unknown_0C86A0/__getTrackByte.s @@ -1,4 +1,4 @@ -glabel func_800C7BE0 +glabel __getTrackByte /* 0C87E0 800C7BE0 00851021 */ addu $v0, $a0, $a1 /* 0C87E4 800C7BE4 904E0098 */ lbu $t6, 0x98($v0) /* 0C87E8 800C7BE8 00057880 */ sll $t7, $a1, 2 diff --git a/lib/asm/non_matchings/unknown_0C86A0/func_800C7CA4.s b/lib/asm/non_matchings/unknown_0C86A0/__readVarLen.s similarity index 89% rename from lib/asm/non_matchings/unknown_0C86A0/func_800C7CA4.s rename to lib/asm/non_matchings/unknown_0C86A0/__readVarLen.s index fb684df6..7a195458 100644 --- a/lib/asm/non_matchings/unknown_0C86A0/func_800C7CA4.s +++ b/lib/asm/non_matchings/unknown_0C86A0/__readVarLen.s @@ -1,8 +1,8 @@ -glabel func_800C7CA4 +glabel __readVarLen /* 0C88A4 800C7CA4 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0C88A8 800C7CA8 AFBF0014 */ sw $ra, 0x14($sp) /* 0C88AC 800C7CAC 01402025 */ move $a0, $t2 -/* 0C88B0 800C7CB0 0C031EF8 */ jal func_800C7BE0 +/* 0C88B0 800C7CB0 0C031EF8 */ jal __getTrackByte /* 0C88B4 800C7CB4 01602825 */ move $a1, $t3 /* 0C88B8 800C7CB8 304E0080 */ andi $t6, $v0, 0x80 /* 0C88BC 800C7CBC 11C0000A */ beqz $t6, .L800C7CE8 @@ -10,7 +10,7 @@ glabel func_800C7CA4 /* 0C88C4 800C7CC4 3049007F */ andi $t1, $v0, 0x7f .L800C7CC8: /* 0C88C8 800C7CC8 01402025 */ move $a0, $t2 -/* 0C88CC 800C7CCC 0C031EF8 */ jal func_800C7BE0 +/* 0C88CC 800C7CCC 0C031EF8 */ jal __getTrackByte /* 0C88D0 800C7CD0 01602825 */ move $a1, $t3 /* 0C88D4 800C7CD4 000979C0 */ sll $t7, $t1, 7 /* 0C88D8 800C7CD8 3058007F */ andi $t8, $v0, 0x7f diff --git a/lib/asm/non_matchings/unknown_0C86A0/func_800C7FFC.s b/lib/asm/non_matchings/unknown_0C86A0/func_800C7FFC.s index d27084bc..6d4dc5e7 100644 --- a/lib/asm/non_matchings/unknown_0C86A0/func_800C7FFC.s +++ b/lib/asm/non_matchings/unknown_0C86A0/func_800C7FFC.s @@ -35,7 +35,7 @@ glabel func_800C7FFC /* 0C8C7C 800C807C 01A05825 */ move $t3, $t5 /* 0C8C80 800C8080 032FC025 */ or $t8, $t9, $t7 /* 0C8C84 800C8084 AE180004 */ sw $t8, 4($s0) -/* 0C8C88 800C8088 0C031F29 */ jal func_800C7CA4 +/* 0C8C88 800C8088 0C031F29 */ jal __readVarLen /* 0C8C8C 800C808C AD8E0018 */ sw $t6, 0x18($t4) /* 0C8C90 800C8090 10000002 */ b .L800C809C /* 0C8C94 800C8094 AD8200B8 */ sw $v0, 0xb8($t4) @@ -149,7 +149,7 @@ glabel func_800C7FFC /* 0C8E2C 800C822C 1490FFD4 */ bne $a0, $s0, .L800C8180 /* 0C8E30 800C8230 AC5900A8 */ sw $t9, 0xa8($v0) /* 0C8E34 800C8234 02602025 */ move $a0, $s3 -/* 0C8E38 800C8238 0C031F41 */ jal func_800C7D04 +/* 0C8E38 800C8238 0C031F41 */ jal __alCSeqGetTrackEvent /* 0C8E3C 800C823C 02802825 */ move $a1, $s4 /* 0C8E40 800C8240 87A80140 */ lh $t0, 0x140($sp) /* 0C8E44 800C8244 8FA90054 */ lw $t1, 0x54($sp) diff --git a/lib/asm/non_matchings/unknown_0C91A0/func_800C87B4.s b/lib/asm/non_matchings/unknown_0C91A0/alClose.s similarity index 57% rename from lib/asm/non_matchings/unknown_0C91A0/func_800C87B4.s rename to lib/asm/non_matchings/unknown_0C91A0/alClose.s index 5055484f..534b9d7e 100644 --- a/lib/asm/non_matchings/unknown_0C91A0/func_800C87B4.s +++ b/lib/asm/non_matchings/unknown_0C91A0/alClose.s @@ -1,14 +1,14 @@ -glabel func_800C87B4 -/* 0C93B4 800C87B4 3C0E800E */ lui $t6, %hi(D_800E3780) # $t6, 0x800e -/* 0C93B8 800C87B8 8DCE3780 */ lw $t6, %lo(D_800E3780)($t6) +glabel alClose +/* 0C93B4 800C87B4 3C0E800E */ lui $t6, %hi(alGlobals) # $t6, 0x800e +/* 0C93B8 800C87B8 8DCE3780 */ lw $t6, %lo(alGlobals)($t6) /* 0C93BC 800C87BC 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0C93C0 800C87C0 AFBF0014 */ sw $ra, 0x14($sp) /* 0C93C4 800C87C4 51C00006 */ beql $t6, $zero, .L800C87E0 /* 0C93C8 800C87C8 8FBF0014 */ lw $ra, 0x14($sp) -/* 0C93CC 800C87CC 0C034B18 */ jal func_800D2C60 +/* 0C93CC 800C87CC 0C034B18 */ jal alSynDelete /* 0C93D0 800C87D0 00000000 */ nop -/* 0C93D4 800C87D4 3C01800E */ lui $at, %hi(D_800E3780) # $at, 0x800e -/* 0C93D8 800C87D8 AC203780 */ sw $zero, %lo(D_800E3780)($at) +/* 0C93D4 800C87D4 3C01800E */ lui $at, %hi(alGlobals) # $at, 0x800e +/* 0C93D8 800C87D8 AC203780 */ sw $zero, %lo(alGlobals)($at) /* 0C93DC 800C87DC 8FBF0014 */ lw $ra, 0x14($sp) .L800C87E0: /* 0C93E0 800C87E0 27BD0018 */ addiu $sp, $sp, 0x18 diff --git a/lib/asm/non_matchings/unknown_0C91A0/func_800C87EC.s b/lib/asm/non_matchings/unknown_0C91A0/alInit.s similarity index 75% rename from lib/asm/non_matchings/unknown_0C91A0/func_800C87EC.s rename to lib/asm/non_matchings/unknown_0C91A0/alInit.s index 358218ea..2a30533a 100644 --- a/lib/asm/non_matchings/unknown_0C91A0/func_800C87EC.s +++ b/lib/asm/non_matchings/unknown_0C91A0/alInit.s @@ -1,6 +1,6 @@ -glabel func_800C87EC -/* 0C93EC 800C87EC 3C02800E */ lui $v0, %hi(D_800E3780) # $v0, 0x800e -/* 0C93F0 800C87F0 24423780 */ addiu $v0, %lo(D_800E3780) # addiu $v0, $v0, 0x3780 +glabel alInit +/* 0C93EC 800C87EC 3C02800E */ lui $v0, %hi(alGlobals) # $v0, 0x800e +/* 0C93F0 800C87F0 24423780 */ addiu $v0, %lo(alGlobals) # addiu $v0, $v0, 0x3780 /* 0C93F4 800C87F4 8C4E0000 */ lw $t6, ($v0) /* 0C93F8 800C87F8 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0C93FC 800C87FC AFBF0014 */ sw $ra, 0x14($sp) diff --git a/lib/asm/non_matchings/unknown_0C9C90/func_800C9420.s b/lib/asm/non_matchings/unknown_0C9C90/_allocatePVoice.s similarity index 99% rename from lib/asm/non_matchings/unknown_0C9C90/func_800C9420.s rename to lib/asm/non_matchings/unknown_0C9C90/_allocatePVoice.s index 70a5fdae..73fe79a9 100644 --- a/lib/asm/non_matchings/unknown_0C9C90/func_800C9420.s +++ b/lib/asm/non_matchings/unknown_0C9C90/_allocatePVoice.s @@ -1,4 +1,4 @@ -glabel func_800C9420 +glabel _allocatePVoice /* 0CA020 800C9420 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 0CA024 800C9424 AFBF0014 */ sw $ra, 0x14($sp) /* 0CA028 800C9428 AFA60030 */ sw $a2, 0x30($sp) diff --git a/lib/asm/non_matchings/unknown_0C9C90/func_800C9090.s b/lib/asm/non_matchings/unknown_0C9C90/alEvtqFlushType.s similarity index 99% rename from lib/asm/non_matchings/unknown_0C9C90/func_800C9090.s rename to lib/asm/non_matchings/unknown_0C9C90/alEvtqFlushType.s index e7548973..4e630fbe 100644 --- a/lib/asm/non_matchings/unknown_0C9C90/func_800C9090.s +++ b/lib/asm/non_matchings/unknown_0C9C90/alEvtqFlushType.s @@ -1,4 +1,4 @@ -glabel func_800C9090 +glabel alEvtqFlushType /* 0C9C90 800C9090 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 0C9C94 800C9094 AFB30020 */ sw $s3, 0x20($sp) /* 0C9C98 800C9098 00059C00 */ sll $s3, $a1, 0x10 diff --git a/lib/asm/non_matchings/unknown_0C9C90/func_800C9508.s b/lib/asm/non_matchings/unknown_0C9C90/alSynAllocVoice.s similarity index 95% rename from lib/asm/non_matchings/unknown_0C9C90/func_800C9508.s rename to lib/asm/non_matchings/unknown_0C9C90/alSynAllocVoice.s index 6bc646d9..6d92682b 100644 --- a/lib/asm/non_matchings/unknown_0C9C90/func_800C9508.s +++ b/lib/asm/non_matchings/unknown_0C9C90/alSynAllocVoice.s @@ -1,4 +1,4 @@ -glabel func_800C9508 +glabel alSynAllocVoice /* 0CA108 800C9508 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 0CA10C 800C950C AFBF001C */ sw $ra, 0x1c($sp) /* 0CA110 800C9510 AFB00018 */ sw $s0, 0x18($sp) @@ -16,7 +16,7 @@ glabel func_800C9508 /* 0CA140 800C9540 A4B80018 */ sh $t8, 0x18($a1) /* 0CA144 800C9544 84C60000 */ lh $a2, ($a2) /* 0CA148 800C9548 8FA40030 */ lw $a0, 0x30($sp) -/* 0CA14C 800C954C 0C032508 */ jal func_800C9420 +/* 0CA14C 800C954C 0C032508 */ jal _allocatePVoice /* 0CA150 800C9550 27A5002C */ addiu $a1, $sp, 0x2c /* 0CA154 800C9554 8FB9002C */ lw $t9, 0x2c($sp) /* 0CA158 800C9558 53200035 */ beql $t9, $zero, .L800C9630 @@ -28,7 +28,7 @@ glabel func_800C9508 /* 0CA170 800C9570 8FA9002C */ lw $t1, 0x2c($sp) /* 0CA174 800C9574 8D2A0008 */ lw $t2, 8($t1) /* 0CA178 800C9578 AD400008 */ sw $zero, 8($t2) -/* 0CA17C 800C957C 0C01959A */ jal func_80065668 +/* 0CA17C 800C957C 0C01959A */ jal __allocParam /* 0CA180 800C9580 AFA40028 */ sw $a0, 0x28($sp) /* 0CA184 800C9584 8FAB0030 */ lw $t3, 0x30($sp) /* 0CA188 800C9588 8FA40028 */ lw $a0, 0x28($sp) @@ -46,7 +46,7 @@ glabel func_800C9508 /* 0CA1B8 800C95B8 8C990008 */ lw $t9, 8($a0) /* 0CA1BC 800C95BC 0320F809 */ jalr $t9 /* 0CA1C0 800C95C0 00000000 */ nop -/* 0CA1C4 800C95C4 0C01959A */ jal func_80065668 +/* 0CA1C4 800C95C4 0C01959A */ jal __allocParam /* 0CA1C8 800C95C8 00000000 */ nop /* 0CA1CC 800C95CC 8FA40028 */ lw $a0, 0x28($sp) /* 0CA1D0 800C95D0 10400012 */ beqz $v0, .L800C961C diff --git a/lib/asm/non_matchings/unknown_0CA250/func_800C9650.s b/lib/asm/non_matchings/unknown_0CA250/alSynSetVol.s similarity index 93% rename from lib/asm/non_matchings/unknown_0CA250/func_800C9650.s rename to lib/asm/non_matchings/unknown_0CA250/alSynSetVol.s index 7fb052bb..53b83844 100644 --- a/lib/asm/non_matchings/unknown_0CA250/func_800C9650.s +++ b/lib/asm/non_matchings/unknown_0CA250/alSynSetVol.s @@ -1,4 +1,4 @@ -glabel func_800C9650 +glabel alSynSetVol /* 0CA250 800C9650 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 0CA254 800C9654 AFBF0014 */ sw $ra, 0x14($sp) /* 0CA258 800C9658 AFA50024 */ sw $a1, 0x24($sp) @@ -7,7 +7,7 @@ glabel func_800C9650 /* 0CA264 800C9664 8CAF0008 */ lw $t7, 8($a1) /* 0CA268 800C9668 51E0001D */ beql $t7, $zero, .L800C96E0 /* 0CA26C 800C966C 8FBF0014 */ lw $ra, 0x14($sp) -/* 0CA270 800C9670 0C01959A */ jal func_80065668 +/* 0CA270 800C9670 0C01959A */ jal __allocParam /* 0CA274 800C9674 AFA40020 */ sw $a0, 0x20($sp) /* 0CA278 800C9678 10400018 */ beqz $v0, .L800C96DC /* 0CA27C 800C967C 8FA40020 */ lw $a0, 0x20($sp) @@ -22,7 +22,7 @@ glabel func_800C9650 /* 0CA2A0 800C96A0 87AC002A */ lh $t4, 0x2a($sp) /* 0CA2A4 800C96A4 AC4C000C */ sw $t4, 0xc($v0) /* 0CA2A8 800C96A8 AFA2001C */ sw $v0, 0x1c($sp) -/* 0CA2AC 800C96AC 0C0195F1 */ jal func_800657C4 +/* 0CA2AC 800C96AC 0C0195F1 */ jal __timeToSamples /* 0CA2B0 800C96B0 8FA5002C */ lw $a1, 0x2c($sp) /* 0CA2B4 800C96B4 8FA6001C */ lw $a2, 0x1c($sp) /* 0CA2B8 800C96B8 24050003 */ li $a1, 3 diff --git a/lib/asm/non_matchings/unknown_0CA2F0/func_800C96F0.s b/lib/asm/non_matchings/unknown_0CA2F0/func_800C96F0.s index 24a64656..9f1e7387 100644 --- a/lib/asm/non_matchings/unknown_0CA2F0/func_800C96F0.s +++ b/lib/asm/non_matchings/unknown_0CA2F0/func_800C96F0.s @@ -6,7 +6,7 @@ glabel func_800C96F0 /* 0CA300 800C9700 8CAE0008 */ lw $t6, 8($a1) /* 0CA304 800C9704 51C0001A */ beql $t6, $zero, .L800C9770 /* 0CA308 800C9708 8FBF0014 */ lw $ra, 0x14($sp) -/* 0CA30C 800C970C 0C01959A */ jal func_80065668 +/* 0CA30C 800C970C 0C01959A */ jal __allocParam /* 0CA310 800C9710 AFA5001C */ sw $a1, 0x1c($sp) /* 0CA314 800C9714 8FA7001C */ lw $a3, 0x1c($sp) /* 0CA318 800C9718 10400014 */ beqz $v0, .L800C976C diff --git a/lib/asm/non_matchings/unknown_0CA380/func_800C9780.s b/lib/asm/non_matchings/unknown_0CA380/alSynSetPitch.s similarity index 96% rename from lib/asm/non_matchings/unknown_0CA380/func_800C9780.s rename to lib/asm/non_matchings/unknown_0CA380/alSynSetPitch.s index 465ce432..372bb67c 100644 --- a/lib/asm/non_matchings/unknown_0CA380/func_800C9780.s +++ b/lib/asm/non_matchings/unknown_0CA380/alSynSetPitch.s @@ -1,4 +1,4 @@ -glabel func_800C9780 +glabel alSynSetPitch /* 0CA380 800C9780 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0CA384 800C9784 AFBF0014 */ sw $ra, 0x14($sp) /* 0CA388 800C9788 AFA40018 */ sw $a0, 0x18($sp) @@ -6,7 +6,7 @@ glabel func_800C9780 /* 0CA390 800C9790 8CAE0008 */ lw $t6, 8($a1) /* 0CA394 800C9794 51C00018 */ beql $t6, $zero, .L800C97F8 /* 0CA398 800C9798 8FBF0014 */ lw $ra, 0x14($sp) -/* 0CA39C 800C979C 0C01959A */ jal func_80065668 +/* 0CA39C 800C979C 0C01959A */ jal __allocParam /* 0CA3A0 800C97A0 AFA5001C */ sw $a1, 0x1c($sp) /* 0CA3A4 800C97A4 8FA7001C */ lw $a3, 0x1c($sp) /* 0CA3A8 800C97A8 10400012 */ beqz $v0, .L800C97F4 diff --git a/lib/asm/non_matchings/unknown_0CA410/func_800C9810.s b/lib/asm/non_matchings/unknown_0CA410/func_800C9810.s index d195056a..8057c32e 100644 --- a/lib/asm/non_matchings/unknown_0CA410/func_800C9810.s +++ b/lib/asm/non_matchings/unknown_0CA410/func_800C9810.s @@ -6,7 +6,7 @@ glabel func_800C9810 /* 0CA420 800C9820 8CAE0008 */ lw $t6, 8($a1) /* 0CA424 800C9824 51C0001C */ beql $t6, $zero, .L800C9898 /* 0CA428 800C9828 8FBF0014 */ lw $ra, 0x14($sp) -/* 0CA42C 800C982C 0C01959A */ jal func_80065668 +/* 0CA42C 800C982C 0C01959A */ jal __allocParam /* 0CA430 800C9830 AFA5001C */ sw $a1, 0x1c($sp) /* 0CA434 800C9834 8FA7001C */ lw $a3, 0x1c($sp) /* 0CA438 800C9838 10400016 */ beqz $v0, .L800C9894 diff --git a/lib/asm/non_matchings/unknown_0CA4B0/func_800C98B0.s b/lib/asm/non_matchings/unknown_0CA4B0/alSynStopVoice.s similarity index 95% rename from lib/asm/non_matchings/unknown_0CA4B0/func_800C98B0.s rename to lib/asm/non_matchings/unknown_0CA4B0/alSynStopVoice.s index 9b899fd7..25ba8c4e 100644 --- a/lib/asm/non_matchings/unknown_0CA4B0/func_800C98B0.s +++ b/lib/asm/non_matchings/unknown_0CA4B0/alSynStopVoice.s @@ -1,11 +1,11 @@ -glabel func_800C98B0 +glabel alSynStopVoice /* 0CA4B0 800C98B0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0CA4B4 800C98B4 AFBF0014 */ sw $ra, 0x14($sp) /* 0CA4B8 800C98B8 AFA40018 */ sw $a0, 0x18($sp) /* 0CA4BC 800C98BC 8CAE0008 */ lw $t6, 8($a1) /* 0CA4C0 800C98C0 51C00016 */ beql $t6, $zero, .L800C991C /* 0CA4C4 800C98C4 8FBF0014 */ lw $ra, 0x14($sp) -/* 0CA4C8 800C98C8 0C01959A */ jal func_80065668 +/* 0CA4C8 800C98C8 0C01959A */ jal __allocParam /* 0CA4CC 800C98CC AFA5001C */ sw $a1, 0x1c($sp) /* 0CA4D0 800C98D0 8FA7001C */ lw $a3, 0x1c($sp) /* 0CA4D4 800C98D4 10400010 */ beqz $v0, .L800C9918 diff --git a/lib/asm/non_matchings/unknown_0CA530/func_800C99E0.s b/lib/asm/non_matchings/unknown_0CA530/alCents2Ratio.s similarity index 98% rename from lib/asm/non_matchings/unknown_0CA530/func_800C99E0.s rename to lib/asm/non_matchings/unknown_0CA530/alCents2Ratio.s index a89a04ed..a0bde7af 100644 --- a/lib/asm/non_matchings/unknown_0CA530/func_800C99E0.s +++ b/lib/asm/non_matchings/unknown_0CA530/alCents2Ratio.s @@ -1,4 +1,4 @@ -glabel func_800C99E0 +glabel alCents2Ratio /* 0CA5E0 800C99E0 3C013F80 */ li $at, 0x3F800000 # 1.000000 /* 0CA5E4 800C99E4 44811000 */ mtc1 $at, $f2 /* 0CA5E8 800C99E8 04800004 */ bltz $a0, .L800C99FC diff --git a/lib/asm/non_matchings/unknown_0CA530/func_800C9930.s b/lib/asm/non_matchings/unknown_0CA530/alSynFreeVoice.s similarity index 94% rename from lib/asm/non_matchings/unknown_0CA530/func_800C9930.s rename to lib/asm/non_matchings/unknown_0CA530/alSynFreeVoice.s index ea651ecc..a2abd84c 100644 --- a/lib/asm/non_matchings/unknown_0CA530/func_800C9930.s +++ b/lib/asm/non_matchings/unknown_0CA530/alSynFreeVoice.s @@ -1,4 +1,4 @@ -glabel func_800C9930 +glabel alSynFreeVoice /* 0CA530 800C9930 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0CA534 800C9934 AFBF0014 */ sw $ra, 0x14($sp) /* 0CA538 800C9938 8CA60008 */ lw $a2, 8($a1) @@ -10,7 +10,7 @@ glabel func_800C9930 /* 0CA550 800C9950 51C0001A */ beql $t6, $zero, .L800C99BC /* 0CA554 800C9954 01002025 */ move $a0, $t0 /* 0CA558 800C9958 AFA5001C */ sw $a1, 0x1c($sp) -/* 0CA55C 800C995C 0C01959A */ jal func_80065668 +/* 0CA55C 800C995C 0C01959A */ jal __allocParam /* 0CA560 800C9960 AFA40018 */ sw $a0, 0x18($sp) /* 0CA564 800C9964 8FA7001C */ lw $a3, 0x1c($sp) /* 0CA568 800C9968 8FA80018 */ lw $t0, 0x18($sp) @@ -36,7 +36,7 @@ glabel func_800C9930 /* 0CA5B8 800C99B8 01002025 */ move $a0, $t0 .L800C99BC: /* 0CA5BC 800C99BC 00C02825 */ move $a1, $a2 -/* 0CA5C0 800C99C0 0C0195C7 */ jal func_8006571C +/* 0CA5C0 800C99C0 0C0195C7 */ jal __freePVoices /* 0CA5C4 800C99C4 AFA7001C */ sw $a3, 0x1c($sp) /* 0CA5C8 800C99C8 8FA7001C */ lw $a3, 0x1c($sp) .L800C99CC: diff --git a/lib/asm/non_matchings/unknown_0CA6E0/func_800C9AE0.s b/lib/asm/non_matchings/unknown_0CA6E0/alSynSetPriority.s similarity index 97% rename from lib/asm/non_matchings/unknown_0CA6E0/func_800C9AE0.s rename to lib/asm/non_matchings/unknown_0CA6E0/alSynSetPriority.s index a29735ad..b906121c 100644 --- a/lib/asm/non_matchings/unknown_0CA6E0/func_800C9AE0.s +++ b/lib/asm/non_matchings/unknown_0CA6E0/alSynSetPriority.s @@ -1,4 +1,4 @@ -glabel func_800C9AE0 +glabel alSynSetPriority /* 0CA6E0 800C9AE0 AFA40000 */ sw $a0, ($sp) /* 0CA6E4 800C9AE4 AFA60008 */ sw $a2, 8($sp) /* 0CA6E8 800C9AE8 03E00008 */ jr $ra diff --git a/lib/asm/non_matchings/unknown_0CA9A0/D_800CA0D0.s b/lib/asm/non_matchings/unknown_0CA9A0/alEnvMixerPull.s similarity index 99% rename from lib/asm/non_matchings/unknown_0CA9A0/D_800CA0D0.s rename to lib/asm/non_matchings/unknown_0CA9A0/alEnvMixerPull.s index bb0e956c..58539f14 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/D_800CA0D0.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/alEnvMixerPull.s @@ -1,4 +1,4 @@ -glabel D_800CA0D0 +glabel alEnvMixerPull /* 0CACD0 800CA0D0 27BDFFA0 */ addiu $sp, $sp, -0x60 /* 0CACD4 800CA0D4 AFBF001C */ sw $ra, 0x1c($sp) /* 0CACD8 800CA0D8 AFA40060 */ sw $a0, 0x60($sp) @@ -507,8 +507,8 @@ glabel D_800CA0D0 /* 0CB464 800CA864 01802025 */ move $a0, $t4 /* 0CB468 800CA868 10000030 */ b .L800CA92C /* 0CB46C 800CA86C 00000000 */ nop -/* 0CB470 800CA870 3C0A800E */ lui $t2, %hi(D_800E3780) # $t2, 0x800e -/* 0CB474 800CA874 8D4A3780 */ lw $t2, %lo(D_800E3780)($t2) +/* 0CB470 800CA870 3C0A800E */ lui $t2, %hi(alGlobals) # $t2, 0x800e +/* 0CB474 800CA874 8D4A3780 */ lw $t2, %lo(alGlobals)($t2) /* 0CB478 800CA878 00000000 */ nop /* 0CB47C 800CA87C AFAA0024 */ sw $t2, 0x24($sp) /* 0CB480 800CA880 8FB80058 */ lw $t8, 0x58($sp) @@ -524,7 +524,7 @@ glabel D_800CA0D0 /* 0CB4A8 800CA8A8 8FA80020 */ lw $t0, 0x20($sp) /* 0CB4AC 800CA8AC 8FA40024 */ lw $a0, 0x24($sp) /* 0CB4B0 800CA8B0 8D05000C */ lw $a1, 0xc($t0) -/* 0CB4B4 800CA8B4 0C0195C7 */ jal func_8006571C +/* 0CB4B4 800CA8B4 0C0195C7 */ jal __freePVoices /* 0CB4B8 800CA8B8 00000000 */ nop /* 0CB4BC 800CA8BC 1000001B */ b .L800CA92C /* 0CB4C0 800CA8C0 00000000 */ nop @@ -589,7 +589,7 @@ glabel D_800CA0D0 /* 0CB5A4 800CA9A4 AD400040 */ sw $zero, 0x40($t2) .L800CA9A8: /* 0CB5A8 800CA9A8 8FA4003C */ lw $a0, 0x3c($sp) -/* 0CB5AC 800CA9AC 0C0195A7 */ jal func_8006569C +/* 0CB5AC 800CA9AC 0C0195A7 */ jal __freeParam /* 0CB5B0 800CA9B0 00000000 */ nop /* 0CB5B4 800CA9B4 8FB80058 */ lw $t8, 0x58($sp) /* 0CB5B8 800CA9B8 00000000 */ nop diff --git a/lib/asm/non_matchings/unknown_0CA9A0/func_800CA0B0.s b/lib/asm/non_matchings/unknown_0CA9A0/alFilterNew.s similarity index 94% rename from lib/asm/non_matchings/unknown_0CA9A0/func_800CA0B0.s rename to lib/asm/non_matchings/unknown_0CA9A0/alFilterNew.s index 90f712ba..174cba8b 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/func_800CA0B0.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/alFilterNew.s @@ -1,4 +1,4 @@ -glabel func_800CA0B0 +glabel alFilterNew /* 0CACB0 800CA0B0 AC800000 */ sw $zero, ($a0) /* 0CACB4 800CA0B4 AC850004 */ sw $a1, 4($a0) /* 0CACB8 800CA0B8 AC860008 */ sw $a2, 8($a0) diff --git a/lib/asm/non_matchings/unknown_0CA9A0/alLoadParam.s b/lib/asm/non_matchings/unknown_0CA9A0/alLoadParam.s index 2f3c7f52..801b7b1d 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/alLoadParam.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/alLoadParam.s @@ -10,7 +10,7 @@ glabel alLoadParam /* 0CC160 800CB560 AC860028 */ sw $a2, 0x28($a0) /* 0CC164 800CB564 8CCE0000 */ lw $t6, ($a2) /* 0CC168 800CB568 AC800038 */ sw $zero, 0x38($a0) -/* 0CC16C 800CB56C 3C0F800D */ lui $t7, %hi(D_800CBBEC) # $t7, 0x800d +/* 0CC16C 800CB56C 3C0F800D */ lui $t7, %hi(alLoadPull) # $t7, 0x800d /* 0CC170 800CB570 AC8E0044 */ sw $t6, 0x44($a0) /* 0CC174 800CB574 90C20008 */ lbu $v0, 8($a2) /* 0CC178 800CB578 50400007 */ beql $v0, $zero, .L800CB598 @@ -22,7 +22,7 @@ glabel alLoadParam /* 0CC190 800CB590 8FBF0014 */ lw $ra, 0x14($sp) /* 0CC194 800CB594 8CE20028 */ lw $v0, 0x28($a3) .L800CB598: -/* 0CC198 800CB598 25EFBBEC */ addiu $t7, %lo(D_800CBBEC) # addiu $t7, $t7, -0x4414 +/* 0CC198 800CB598 25EFBBEC */ addiu $t7, %lo(alLoadPull) # addiu $t7, $t7, -0x4414 /* 0CC19C 800CB59C ACEF0004 */ sw $t7, 4($a3) /* 0CC1A0 800CB5A0 8C580004 */ lw $t8, 4($v0) /* 0CC1A4 800CB5A4 24050009 */ li $a1, 9 diff --git a/lib/asm/non_matchings/unknown_0CA9A0/D_800CBBEC.s b/lib/asm/non_matchings/unknown_0CA9A0/alLoadPull.s similarity index 99% rename from lib/asm/non_matchings/unknown_0CA9A0/D_800CBBEC.s rename to lib/asm/non_matchings/unknown_0CA9A0/alLoadPull.s index 2d4be883..be1ca25e 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/D_800CBBEC.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/alLoadPull.s @@ -1,4 +1,4 @@ -glabel D_800CBBEC +glabel alLoadPull /* 0CC7EC 800CBBEC 27BDFF50 */ addiu $sp, $sp, -0xb0 /* 0CC7F0 800CBBF0 AFB70044 */ sw $s7, 0x44($sp) /* 0CC7F4 800CBBF4 AFA700BC */ sw $a3, 0xbc($sp) diff --git a/lib/asm/non_matchings/unknown_0CA9A0/D_800CC17C.s b/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s similarity index 99% rename from lib/asm/non_matchings/unknown_0CA9A0/D_800CC17C.s rename to lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s index 0e68fdfb..c9b3a3ea 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/D_800CC17C.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s @@ -1,4 +1,4 @@ -glabel D_800CC17C +glabel alResamplePull /* 0CCD7C 800CC17C 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 0CCD80 800CC180 AFBF001C */ sw $ra, 0x1c($sp) /* 0CCD84 800CC184 AFA50054 */ sw $a1, 0x54($sp) diff --git a/lib/asm/non_matchings/unknown_0CCF90/D_800CC390.s b/lib/asm/non_matchings/unknown_0CCF90/alMainBusParam.s similarity index 96% rename from lib/asm/non_matchings/unknown_0CCF90/D_800CC390.s rename to lib/asm/non_matchings/unknown_0CCF90/alMainBusParam.s index c59eedd0..66fb4732 100644 --- a/lib/asm/non_matchings/unknown_0CCF90/D_800CC390.s +++ b/lib/asm/non_matchings/unknown_0CCF90/alMainBusParam.s @@ -1,4 +1,4 @@ -glabel D_800CC390 +glabel alMainBusParam /* 0CCF90 800CC390 24010002 */ li $at, 2 /* 0CCF94 800CC394 14A10008 */ bne $a1, $at, .L800CC3B8 /* 0CCF98 800CC398 8C82001C */ lw $v0, 0x1c($a0) diff --git a/lib/asm/non_matchings/unknown_0CCF90/D_800CC3C0.s b/lib/asm/non_matchings/unknown_0CCF90/alMainBusPull.s similarity index 99% rename from lib/asm/non_matchings/unknown_0CCF90/D_800CC3C0.s rename to lib/asm/non_matchings/unknown_0CCF90/alMainBusPull.s index 016018b3..856ef231 100644 --- a/lib/asm/non_matchings/unknown_0CCF90/D_800CC3C0.s +++ b/lib/asm/non_matchings/unknown_0CCF90/alMainBusPull.s @@ -1,4 +1,4 @@ -glabel D_800CC3C0 +glabel alMainBusPull /* 0CCFC0 800CC3C0 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 0CCFC4 800CC3C4 8FA80058 */ lw $t0, 0x58($sp) /* 0CCFC8 800CC3C8 AFBF0044 */ sw $ra, 0x44($sp) diff --git a/lib/asm/non_matchings/unknown_0CCF90/D_800CC514.s b/lib/asm/non_matchings/unknown_0CCF90/alSavePull.s similarity index 99% rename from lib/asm/non_matchings/unknown_0CCF90/D_800CC514.s rename to lib/asm/non_matchings/unknown_0CCF90/alSavePull.s index 402a26ff..3f38f50b 100644 --- a/lib/asm/non_matchings/unknown_0CCF90/D_800CC514.s +++ b/lib/asm/non_matchings/unknown_0CCF90/alSavePull.s @@ -1,4 +1,4 @@ -glabel D_800CC514 +glabel alSavePull /* 0CD114 800CC514 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 0CD118 800CC518 AFBF001C */ sw $ra, 0x1c($sp) /* 0CD11C 800CC51C AFA40020 */ sw $a0, 0x20($sp) diff --git a/lib/asm/non_matchings/unknown_0D3160/func_800D2C60.s b/lib/asm/non_matchings/unknown_0D3160/alSynDelete.s similarity index 89% rename from lib/asm/non_matchings/unknown_0D3160/func_800D2C60.s rename to lib/asm/non_matchings/unknown_0D3160/alSynDelete.s index a0e21b27..78681ef1 100644 --- a/lib/asm/non_matchings/unknown_0D3160/func_800D2C60.s +++ b/lib/asm/non_matchings/unknown_0D3160/alSynDelete.s @@ -1,4 +1,4 @@ -glabel func_800D2C60 +glabel alSynDelete /* 0D3860 800D2C60 03E00008 */ jr $ra /* 0D3864 800D2C64 AC800000 */ sw $zero, ($a0) diff --git a/lib/src/unknown_0C86A0.c b/lib/src/unknown_0C86A0.c index b489ba82..ee6958e2 100644 --- a/lib/src/unknown_0C86A0.c +++ b/lib/src/unknown_0C86A0.c @@ -6,8 +6,8 @@ GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/func_800C7AA0.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/func_800C7B40.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/func_800C7BE0.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/func_800C7CA4.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/func_800C7D04.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/__getTrackByte.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/__readVarLen.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/__alCSeqGetTrackEvent.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/func_800C7FFC.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/func_800C83EC.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/__alCSeqNextDelta.s") diff --git a/lib/src/unknown_0C91A0.c b/lib/src/unknown_0C91A0.c index 38b3a023..af7f01cc 100644 --- a/lib/src/unknown_0C91A0.c +++ b/lib/src/unknown_0C91A0.c @@ -10,8 +10,8 @@ GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/func_800C85D0.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/func_800C8600.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alUnlink.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alLink.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/func_800C87B4.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/func_800C87EC.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alClose.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alInit.s") extern OSThread __osThreadTail; void osCreateMesgQueue(OSMesgQueue *mq, OSMesg *msg, s32 msgCount) diff --git a/lib/src/unknown_0C9C90.c b/lib/src/unknown_0C9C90.c index 3ec10ecf..4665ec56 100644 --- a/lib/src/unknown_0C9C90.c +++ b/lib/src/unknown_0C9C90.c @@ -4,10 +4,10 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9C90/func_800C9090.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9C90/alEvtqFlushType.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9C90/alEvtqPostEvent.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9C90/alEvtqNextEvent.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9C90/alEvtqNew.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9C90/alSynAddPlayer.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9C90/func_800C9420.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9C90/func_800C9508.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9C90/_allocatePVoice.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9C90/alSynAllocVoice.s") diff --git a/lib/src/unknown_0CA250.c b/lib/src/unknown_0CA250.c index 9ef488df..be109428 100644 --- a/lib/src/unknown_0CA250.c +++ b/lib/src/unknown_0CA250.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA250/func_800C9650.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA250/alSynSetVol.s") diff --git a/lib/src/unknown_0CA380.c b/lib/src/unknown_0CA380.c index dbba8637..8cd8f15c 100644 --- a/lib/src/unknown_0CA380.c +++ b/lib/src/unknown_0CA380.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA380/func_800C9780.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA380/alSynSetPitch.s") diff --git a/lib/src/unknown_0CA4B0.c b/lib/src/unknown_0CA4B0.c index d19cd0b4..021db36d 100644 --- a/lib/src/unknown_0CA4B0.c +++ b/lib/src/unknown_0CA4B0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA4B0/func_800C98B0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA4B0/alSynStopVoice.s") diff --git a/lib/src/unknown_0CA530.c b/lib/src/unknown_0CA530.c index 5217cc2f..0c6bbb03 100644 --- a/lib/src/unknown_0CA530.c +++ b/lib/src/unknown_0CA530.c @@ -4,7 +4,7 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA530/func_800C9930.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA530/func_800C99E0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA530/alSynFreeVoice.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA530/alCents2Ratio.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA530/osSetIntMask.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA530/sqrtf.s") diff --git a/lib/src/unknown_0CA6E0.c b/lib/src/unknown_0CA6E0.c index 83cd4c5b..443a8058 100644 --- a/lib/src/unknown_0CA6E0.c +++ b/lib/src/unknown_0CA6E0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA6E0/func_800C9AE0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA6E0/alSynSetPriority.s") diff --git a/lib/src/unknown_0CA9A0.c b/lib/src/unknown_0CA9A0.c index f1db61e5..38ba6f31 100644 --- a/lib/src/unknown_0CA9A0.c +++ b/lib/src/unknown_0CA9A0.c @@ -4,8 +4,8 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CA0B0.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/D_800CA0D0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/alFilterNew.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/alEnvMixerPull.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/alEnvmixerParam.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CAC5C.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s") @@ -13,6 +13,6 @@ GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CB498.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/alLoadParam.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/D_800CB714.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CBAC0.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/D_800CBBEC.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/alLoadPull.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/alResampleParam.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/D_800CC17C.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/alResamplePull.s") diff --git a/lib/src/unknown_0CCF90.c b/lib/src/unknown_0CCF90.c index 812bc4f2..e35b6c53 100644 --- a/lib/src/unknown_0CCF90.c +++ b/lib/src/unknown_0CCF90.c @@ -4,10 +4,10 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/D_800CC390.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/D_800CC3C0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/alMainBusParam.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/alMainBusPull.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/alSaveParam.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/D_800CC514.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/alSavePull.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/osInitialize.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/osSetThreadPri.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CCF90/guPerspectiveF.s") diff --git a/lib/src/unknown_0D3160.c b/lib/src/unknown_0D3160.c index b9db571d..3804eb00 100644 --- a/lib/src/unknown_0D3160.c +++ b/lib/src/unknown_0D3160.c @@ -38,7 +38,7 @@ s32 osPiRawStartDma(s32 direction, u32 devAddr, void *dramAddr, u32 size) GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3160/osEPiRawStartDma.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3160/__osDevMgrMain.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3160/__osViInit.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3160/func_800D2C60.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3160/alSynDelete.s") void __osDequeueThread(OSThread **queue, OSThread *t) { diff --git a/src/unknown_003260.c b/src/unknown_003260.c index 369abc3f..df405f20 100644 --- a/src/unknown_003260.c +++ b/src/unknown_003260.c @@ -54,8 +54,8 @@ void func_8000318C(s32 arg0) { } GLOBAL_ASM("asm/non_matchings/unknown_003260/alSndpNew.s") -GLOBAL_ASM("asm/non_matchings/unknown_003260/D_800033C8.s") -GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80003470.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") GLOBAL_ASM("asm/non_matchings/unknown_003260/func_8000418C.s") GLOBAL_ASM("asm/non_matchings/unknown_003260/func_800041FC.s") diff --git a/src/unknown_005740.c b/src/unknown_005740.c index e4d6432b..c220f990 100644 --- a/src/unknown_005740.c +++ b/src/unknown_005740.c @@ -39,20 +39,20 @@ GLOBAL_ASM("asm/non_matchings/unknown_005740/func_80009B7C.s") GLOBAL_ASM("asm/non_matchings/unknown_005740/func_80009D6C.s") GLOBAL_ASM("asm/non_matchings/unknown_005740/func_8000A2E8.s") GLOBAL_ASM("asm/non_matchings/unknown_005740/func_8000A414.s") -GLOBAL_ASM("asm/non_matchings/unknown_005740/func_8000A71C.s") -GLOBAL_ASM("asm/non_matchings/unknown_005740/func_8000A7C4.s") -GLOBAL_ASM("asm/non_matchings/unknown_005740/func_8000A84C.s") -GLOBAL_ASM("asm/non_matchings/unknown_005740/func_8000A8D0.s") -GLOBAL_ASM("asm/non_matchings/unknown_005740/func_8000A9F8.s") -GLOBAL_ASM("asm/non_matchings/unknown_005740/func_8000AA88.s") -GLOBAL_ASM("asm/non_matchings/unknown_005740/func_8000AAAC.s") -GLOBAL_ASM("asm/non_matchings/unknown_005740/func_8000AB00.s") -GLOBAL_ASM("asm/non_matchings/unknown_005740/func_8000AC34.s") -GLOBAL_ASM("asm/non_matchings/unknown_005740/func_8000ACE0.s") -GLOBAL_ASM("asm/non_matchings/unknown_005740/func_8000AD98.s") -GLOBAL_ASM("asm/non_matchings/unknown_005740/func_8000ADF4.s") +GLOBAL_ASM("asm/non_matchings/unknown_005740/__mapVoice.s") +GLOBAL_ASM("asm/non_matchings/unknown_005740/__unmapVoice.s") +GLOBAL_ASM("asm/non_matchings/unknown_005740/__lookupVoice.s") +GLOBAL_ASM("asm/non_matchings/unknown_005740/__lookupSoundQuick.s") +GLOBAL_ASM("asm/non_matchings/unknown_005740/__vsVol.s") +GLOBAL_ASM("asm/non_matchings/unknown_005740/__vsDelta.s") +GLOBAL_ASM("asm/non_matchings/unknown_005740/__vsPan.s") +GLOBAL_ASM("asm/non_matchings/unknown_005740/__seqpReleaseVoice.s") +GLOBAL_ASM("asm/non_matchings/unknown_005740/__voiceNeedsNoteKill.s") +GLOBAL_ASM("asm/non_matchings/unknown_005740/__initFromBank.s") +GLOBAL_ASM("asm/non_matchings/unknown_005740/__setInstChanState.s") +GLOBAL_ASM("asm/non_matchings/unknown_005740/__resetPerfChanState.s") GLOBAL_ASM("asm/non_matchings/unknown_005740/__initChanState.s") -GLOBAL_ASM("asm/non_matchings/unknown_005740/func_8000AEFC.s") +GLOBAL_ASM("asm/non_matchings/unknown_005740/__seqpStopOsc.s") /* Unknown Size */ typedef struct unk8000B010 { diff --git a/src/unknown_061D30.c b/src/unknown_061D30.c index ce2c3a94..2268bc29 100644 --- a/src/unknown_061D30.c +++ b/src/unknown_061D30.c @@ -4,11 +4,11 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_061D30/func_80062290.s") -GLOBAL_ASM("asm/non_matchings/unknown_061D30/D_80062408.s") -GLOBAL_ASM("asm/non_matchings/unknown_061D30/func_800629CC.s") -GLOBAL_ASM("asm/non_matchings/unknown_061D30/func_80062A3C.s") -GLOBAL_ASM("asm/non_matchings/unknown_061D30/func_80062B00.s") -GLOBAL_ASM("asm/non_matchings/unknown_061D30/func_800637EC.s") -GLOBAL_ASM("asm/non_matchings/unknown_061D30/func_80063984.s") -GLOBAL_ASM("asm/non_matchings/unknown_061D30/func_80063A34.s") +GLOBAL_ASM("asm/non_matchings/unknown_061D30/alCSPNew.s") +GLOBAL_ASM("asm/non_matchings/unknown_061D30/__CSPVoiceHandler.s") +GLOBAL_ASM("asm/non_matchings/unknown_061D30/__CSPPostNextSeqEvent.s") +GLOBAL_ASM("asm/non_matchings/unknown_061D30/__CSPHandleNextSeqEvent.s") +GLOBAL_ASM("asm/non_matchings/unknown_061D30/__CSPHandleMIDIMsg.s") +GLOBAL_ASM("asm/non_matchings/unknown_061D30/__CSPHandleMetaMsg.s") +GLOBAL_ASM("asm/non_matchings/unknown_061D30/__CSPRepostEvent.s") +GLOBAL_ASM("asm/non_matchings/unknown_061D30/__setUsptFromTempo.s") diff --git a/src/unknown_064830.c b/src/unknown_064830.c index fee4cbbb..c205b154 100644 --- a/src/unknown_064830.c +++ b/src/unknown_064830.c @@ -3,38 +3,39 @@ #include "types.h" #include "macros.h" +#include "libultra_internal.h" -extern s32 D_80065900; +extern s32 alAuxBusPull; extern s32 alAuxBusParam; -extern s32 D_800CA0D0; +extern s32 alEnvMixerPull; extern s32 alEnvmixerParam; extern s32 alLoadParam; -extern s32 D_800CBBEC; +extern s32 alLoadPull; extern s32 alResampleParam; -extern s32 D_800CC17C; -extern s32 D_800CC390; -extern s32 D_800CC3C0; +extern s32 alResamplePull; +extern s32 alMainBusParam; +extern s32 alMainBusPull; extern s32 alSaveParam; -extern s32 D_800CC514; +extern s32 alSavePull; -GLOBAL_ASM("asm/non_matchings/unknown_064830/D_80063C30.s") +GLOBAL_ASM("asm/non_matchings/unknown_064830/alFxPull.s") -s32 D_80063F94(s32* arg0, s32 arg1, s32 arg2) { +s32 alFxParam(s32* arg0, s32 arg1, s32 arg2) { if (arg1 == 1) { *arg0 = arg2; } return 0; } -GLOBAL_ASM("asm/non_matchings/unknown_064830/D_80063FAC.s") -GLOBAL_ASM("asm/non_matchings/unknown_064830/func_80064224.s") -GLOBAL_ASM("asm/non_matchings/unknown_064830/func_800644A0.s") -GLOBAL_ASM("asm/non_matchings/unknown_064830/func_80064638.s") -GLOBAL_ASM("asm/non_matchings/unknown_064830/func_800647D0.s") -GLOBAL_ASM("asm/non_matchings/unknown_064830/func_80064884.s") +GLOBAL_ASM("asm/non_matchings/unknown_064830/alFxParamHdl.s") +GLOBAL_ASM("asm/non_matchings/unknown_064830/_loadOutputBuffer.s") +GLOBAL_ASM("asm/non_matchings/unknown_064830/_loadBuffer.s") +GLOBAL_ASM("asm/non_matchings/unknown_064830/_saveBuffer.s") +GLOBAL_ASM("asm/non_matchings/unknown_064830/_filterBuffer.s") +GLOBAL_ASM("asm/non_matchings/unknown_064830/_doModFunc.s") GLOBAL_ASM("asm/non_matchings/unknown_064830/func_8006492C.s") -GLOBAL_ASM("asm/non_matchings/unknown_064830/func_80064950.s") -GLOBAL_ASM("asm/non_matchings/unknown_064830/func_80064A08.s") +GLOBAL_ASM("asm/non_matchings/unknown_064830/init_lpfilter.s") +GLOBAL_ASM("asm/non_matchings/unknown_064830/alFxNew.s") typedef struct unk80064E54 { u8 unk00[0x14]; // unknown @@ -60,7 +61,7 @@ typedef struct unk80064E54 { } unk80064E54; void alEnvmixerNew(unk80064E54* arg0, s32 arg1) { - func_800CA0B0(arg0, &D_800CA0D0, &alEnvmixerParam, 4); + alFilterNew(arg0, &alEnvMixerPull, &alEnvmixerParam, 4); arg0->unk14 = alHeapDBAlloc(0, 0, arg1, 1, 0x50); arg0->unk38 = 1; arg0->unk48 = 0; @@ -81,7 +82,7 @@ void alEnvmixerNew(unk80064E54* arg0, s32 arg1) { arg0->unk44 = 0; } -typedef struct unk80064EF8 { +typedef struct ALFilter_s { u8 unk00[0x14]; // unknown s32 unk14; s32 unk18; @@ -92,10 +93,10 @@ typedef struct unk80064EF8 { s32 unk3C; s32 unk40; s32 unk44; -} unk80064EF8; +} ALFilter; -void alLoadNew(unk80064EF8* arg0, s32 (*arg1)(s32*), s32 arg2) { - func_800CA0B0(arg0, &D_800CBBEC, &alLoadParam, 0); +void alLoadNew(ALFilter* arg0, s32 (*arg1)(s32*), s32 arg2) { + alFilterNew(arg0, &alLoadPull, &alLoadParam, 0); arg0->unk14 = alHeapDBAlloc(0, 0, arg2, 1, 0x20); arg0->unk18 = alHeapDBAlloc(0, 0, arg2, 1, 0x20); arg0->unk30 = arg1(&arg0->unk34); @@ -117,7 +118,7 @@ typedef struct unk80064F9C { } unk80064F9C; void alResampleNew(unk80064F9C* arg0, s32 arg1) { - func_800CA0B0(arg0, &D_800CC17C, &alResampleParam, 1); + alFilterNew(arg0, &alResamplePull, &alResampleParam, 1); arg0->unk14 = alHeapDBAlloc(0, 0, arg1, 1, 0x20); arg0->unk24 = 1; arg0->unk30 = 0; @@ -136,7 +137,7 @@ typedef struct unk80065024 { } unk80065024; void alAuxBusNew(unk80065024* arg0, s32 arg1, s32 arg2) { - func_800CA0B0(arg0, &D_80065900, &alAuxBusParam, 6); + alFilterNew(arg0, &alAuxBusPull, &alAuxBusParam, 6); arg0->unk14 = 0; arg0->unk18 = arg2; arg0->unk1C = arg1; @@ -150,7 +151,7 @@ typedef struct unk80065084 { } unk80065084; void alMainBusNew(unk80065084* arg0, s32 arg1, s32 arg2) { - func_800CA0B0(arg0, &D_800CC3C0, &D_800CC390, 7); + alFilterNew(arg0, &alMainBusPull, &alMainBusParam, 7); arg0->unk14 = 0; arg0->unk18 = arg2; arg0->unk1C = arg1; @@ -163,7 +164,7 @@ typedef struct unk800650E4 { } unk800650E4; void alSaveNew(unk800650E4* arg0) { - func_800CA0B0(arg0, &D_800CC514, &alSaveParam, 3); + alFilterNew(arg0, &alSavePull, &alSaveParam, 3); arg0->unk14 = 0; arg0->unk18 = 1; } diff --git a/src/unknown_065D30.c b/src/unknown_065D30.c index dcca369d..7d56eca1 100644 --- a/src/unknown_065D30.c +++ b/src/unknown_065D30.c @@ -5,11 +5,11 @@ #include "macros.h" GLOBAL_ASM("asm/non_matchings/unknown_065D30/alSynNew.s") -GLOBAL_ASM("asm/non_matchings/unknown_065D30/func_80065494.s") -GLOBAL_ASM("asm/non_matchings/unknown_065D30/func_80065668.s") -GLOBAL_ASM("asm/non_matchings/unknown_065D30/func_8006569C.s") -GLOBAL_ASM("asm/non_matchings/unknown_065D30/func_800656BC.s") -GLOBAL_ASM("asm/non_matchings/unknown_065D30/func_8006571C.s") -GLOBAL_ASM("asm/non_matchings/unknown_065D30/func_80065754.s") -GLOBAL_ASM("asm/non_matchings/unknown_065D30/func_800657C4.s") -GLOBAL_ASM("asm/non_matchings/unknown_065D30/func_800657EC.s") +GLOBAL_ASM("asm/non_matchings/unknown_065D30/alAudioFrame.s") +GLOBAL_ASM("asm/non_matchings/unknown_065D30/__allocParam.s") +GLOBAL_ASM("asm/non_matchings/unknown_065D30/__freeParam.s") +GLOBAL_ASM("asm/non_matchings/unknown_065D30/__collectPVoices.s") +GLOBAL_ASM("asm/non_matchings/unknown_065D30/__freePVoices.s") +GLOBAL_ASM("asm/non_matchings/unknown_065D30/__timeToSamplesNoRound.s") +GLOBAL_ASM("asm/non_matchings/unknown_065D30/__timeToSamples.s") +GLOBAL_ASM("asm/non_matchings/unknown_065D30/__nextSampleTime.s") diff --git a/src/unknown_066460.c b/src/unknown_066460.c index 953fc8d4..dbf5ae34 100644 --- a/src/unknown_066460.c +++ b/src/unknown_066460.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_066460/func_80065860.s") +GLOBAL_ASM("asm/non_matchings/unknown_066460/alSynAllocFX.s") diff --git a/src/unknown_066500.c b/src/unknown_066500.c index e0db5877..a604123d 100644 --- a/src/unknown_066500.c +++ b/src/unknown_066500.c @@ -4,7 +4,7 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("asm/non_matchings/unknown_066500/D_80065900.s") +GLOBAL_ASM("asm/non_matchings/unknown_066500/alAuxBusPull.s") GLOBAL_ASM("asm/non_matchings/unknown_066500/alAuxBusParam.s") GLOBAL_ASM("asm/non_matchings/unknown_066500/func_80065A80.s") -GLOBAL_ASM("asm/non_matchings/unknown_066500/func_80065B20.s") +GLOBAL_ASM("asm/non_matchings/unknown_066500/alSynSetPan.s") diff --git a/src/unknown_0667D0.c b/src/unknown_0667D0.c index 46094138..7d8c591a 100644 --- a/src/unknown_0667D0.c +++ b/src/unknown_0667D0.c @@ -34,7 +34,7 @@ s32 func_80065BEC(s32 arg0) { } } -GLOBAL_ASM("asm/non_matchings/unknown_0667D0/func_80065C38.s") +GLOBAL_ASM("asm/non_matchings/unknown_0667D0/alSynStartVoiceParams.s") void func_80065D40(void) { osInitialize(); diff --git a/undefined_syms.txt b/undefined_syms.txt index 16b32cac..77b290c0 100755 --- a/undefined_syms.txt +++ b/undefined_syms.txt @@ -30,14 +30,14 @@ osAppNMIBuffer = 0x8000031C; D_80002A98 = 0x80002A98; D_80002E38 = 0x80002E38; D_80003008 = 0x80003008; -D_800033C8 = 0x800033C8; +_sndpVoiceHandler = 0x800033C8; D_80019808 = 0x80019808; D_80024D54 = 0x80024D54; -D_80062408 = 0x80062408; -D_80063C30 = 0x80063C30; -D_80063F94 = 0x80063F94; -D_80063FAC = 0x80063FAC; -D_80065900 = 0x80065900; +__CSPVoiceHandler = 0x80062408; +alFxPull = 0x80063C30; +alFxParam = 0x80063F94; +alFxParamHdl = 0x80063FAC; +alAuxBusPull = 0x80065900; alAuxBusParam = 0x800659D4; D_80065D40 = 0x80065D40; D_80065D98 = 0x80065D98; @@ -48,17 +48,17 @@ D_800B6FC4 = 0x800B6FC4; D_800C7340 = 0x800C7340; D_800C74A0 = 0x800C74A0; D_800C9D40 = 0x800C9D40; -D_800CA0D0 = 0x800CA0D0; +alEnvMixerPull = 0x800CA0D0; alEnvmixerParam = 0x800CAA7C; alLoadParam = 0x800CB540; D_800CB714 = 0x800CB714; -D_800CBBEC = 0x800CBBEC; +alLoadPull = 0x800CBBEC; alResampleParam = 0x800CC090; -D_800CC17C = 0x800CC17C; -D_800CC390 = 0x800CC390; -D_800CC3C0 = 0x800CC3C0; +alResamplePull = 0x800CC17C; +alMainBusParam = 0x800CC390; +alMainBusPull = 0x800CC3C0; alSaveParam = 0x800CC4E0; -D_800CC514 = 0x800CC514; +alSavePull = 0x800CC514; viMgrMain = 0x800D1B08; osPiRawStartDma = 0x800D25A0; osEPiRawStartDma = 0x800D2680; @@ -763,7 +763,7 @@ D_800E3770 = 0x800E3770; D_800E3774 = 0x800E3774; D_800E3778 = 0x800E3778; D_800E377C = 0x800E377C; -D_800E3780 = 0x800E3780; +alGlobals = 0x800E3780; D_800E3790 = 0x800E3790; D_800E38A0 = 0x800E38A0; D_800E38A4 = 0x800E38A4;