diff --git a/asm/non_matchings/camera/func_80069484.s b/asm/non_matchings/camera/func_80069484.s index e421c4ac..126b9ed1 100644 --- a/asm/non_matchings/camera/func_80069484.s +++ b/asm/non_matchings/camera/func_80069484.s @@ -100,7 +100,7 @@ glabel func_80069484 /* 06A204 80069604 4407A000 */ mfc1 $a3, $f20 /* 06A208 80069608 AFAB0010 */ sw $t3, 0x10($sp) /* 06A20C 8006960C AFAC0014 */ sw $t4, 0x14($sp) -/* 06A210 80069610 0C01BD93 */ jal func_8006F64C +/* 06A210 80069610 0C01BD93 */ jal guMtxXFMF /* 06A214 80069614 AFAD0018 */ sw $t5, 0x18($sp) /* 06A218 80069618 3C0E8012 */ lui $t6, %hi(D_80120D14) # $t6, 0x8012 /* 06A21C 8006961C 81CE0D14 */ lb $t6, %lo(D_80120D14)($t6) @@ -158,7 +158,7 @@ glabel func_80069484 /* 06A2E8 800696E8 AFAB0018 */ sw $t3, 0x18($sp) /* 06A2EC 800696EC AFB90014 */ sw $t9, 0x14($sp) /* 06A2F0 800696F0 AFB80010 */ sw $t8, 0x10($sp) -/* 06A2F4 800696F4 0C01BD93 */ jal func_8006F64C +/* 06A2F4 800696F4 0C01BD93 */ jal guMtxXFMF /* 06A2F8 800696F8 24841060 */ addiu $a0, %lo(D_80121060) # addiu $a0, $a0, 0x1060 /* 06A2FC 800696FC 8FAC0058 */ lw $t4, 0x58($sp) /* 06A300 80069700 3C013F80 */ li $at, 0x3F800000 # 1.000000 diff --git a/asm/non_matchings/camera/func_8006A10C.s b/asm/non_matchings/camera/func_8006A10C.s index 0f018759..4316321e 100644 --- a/asm/non_matchings/camera/func_8006A10C.s +++ b/asm/non_matchings/camera/func_8006A10C.s @@ -17,10 +17,10 @@ glabel func_8006A10C /* 06AD48 8006A148 3C068012 */ lui $a2, %hi(D_80121100) # $a2, 0x8012 /* 06AD4C 8006A14C 24C61100 */ addiu $a2, %lo(D_80121100) # addiu $a2, $a2, 0x1100 /* 06AD50 8006A150 248410E0 */ addiu $a0, %lo(D_801210E0) # addiu $a0, $a0, 0x10e0 -/* 06AD54 8006A154 0C033308 */ jal func_800CCC20 +/* 06AD54 8006A154 0C033308 */ jal osContInit /* 06AD58 8006A158 27A50023 */ addiu $a1, $sp, 0x23 /* 06AD5C 8006A15C 3C048012 */ lui $a0, %hi(D_801210E0) # $a0, 0x8012 -/* 06AD60 8006A160 0C0333F8 */ jal func_800CCFE0 +/* 06AD60 8006A160 0C0333F8 */ jal osContStartReadData /* 06AD64 8006A164 248410E0 */ addiu $a0, %lo(D_801210E0) # addiu $a0, $a0, 0x10e0 /* 06AD68 8006A168 0C01A90D */ jal func_8006A434 /* 06AD6C 8006A16C 00000000 */ nop diff --git a/asm/non_matchings/camera/func_8006A1C4.s b/asm/non_matchings/camera/func_8006A1C4.s index 41925316..57a2c809 100644 --- a/asm/non_matchings/camera/func_8006A1C4.s +++ b/asm/non_matchings/camera/func_8006A1C4.s @@ -31,7 +31,7 @@ glabel func_8006A1C4 /* 06AE34 8006A234 1420FFF6 */ bnez $at, .L8006A210 /* 06AE38 8006A238 00000000 */ nop /* 06AE3C 8006A23C 3C048012 */ lui $a0, %hi(D_80121110) # $a0, 0x8012 -/* 06AE40 8006A240 0C033429 */ jal func_800CD0A4 +/* 06AE40 8006A240 0C033429 */ jal osContGetReadData /* 06AE44 8006A244 24841110 */ addiu $a0, %lo(D_80121110) # addiu $a0, $a0, 0x1110 /* 06AE48 8006A248 12400043 */ beqz $s2, .L8006A358 /* 06AE4C 8006A24C 8FA4005C */ lw $a0, 0x5c($sp) @@ -114,7 +114,7 @@ glabel func_8006A1C4 /* 06AF58 8006A358 0C01C9C6 */ jal func_80072718 /* 06AF5C 8006A35C 00000000 */ nop /* 06AF60 8006A360 3C048012 */ lui $a0, %hi(D_801210E0) # $a0, 0x8012 -/* 06AF64 8006A364 0C0333F8 */ jal func_800CCFE0 +/* 06AF64 8006A364 0C0333F8 */ jal osContStartReadData /* 06AF68 8006A368 248410E0 */ addiu $a0, %lo(D_801210E0) # addiu $a0, $a0, 0x10e0 .L8006A36C: /* 06AF6C 8006A36C 3C0A800E */ lui $t2, %hi(D_800DD300) # $t2, 0x800e diff --git a/asm/non_matchings/controller_pak/func_80075B18.s b/asm/non_matchings/controller_pak/func_80075B18.s index 792219a4..50ceec96 100644 --- a/asm/non_matchings/controller_pak/func_80075B18.s +++ b/asm/non_matchings/controller_pak/func_80075B18.s @@ -104,7 +104,7 @@ glabel func_80075B18 /* 07689C 80075C9C 161EFFCE */ bne $s0, $fp, .L80075BD8 /* 0768A0 80075CA0 2631000A */ addiu $s1, $s1, 0xa /* 0768A4 80075CA4 8E840000 */ lw $a0, ($s4) -/* 0768A8 80075CA8 0C0333F8 */ jal func_800CCFE0 +/* 0768A8 80075CA8 0C0333F8 */ jal osContStartReadData /* 0768AC 80075CAC 00000000 */ nop /* 0768B0 80075CB0 8FBF003C */ lw $ra, 0x3c($sp) /* 0768B4 80075CB4 8FB00018 */ lw $s0, 0x18($sp) diff --git a/asm/non_matchings/controller_pak/func_80075E60.s b/asm/non_matchings/controller_pak/func_80075E60.s index dd75b207..6162ff1e 100644 --- a/asm/non_matchings/controller_pak/func_80075E60.s +++ b/asm/non_matchings/controller_pak/func_80075E60.s @@ -32,7 +32,7 @@ glabel func_80075E60 /* 076AD4 80075ED4 01F82021 */ addu $a0, $t7, $t8 /* 076AD8 80075ED8 AFA40054 */ sw $a0, 0x54($sp) /* 076ADC 80075EDC 27A50068 */ addiu $a1, $sp, 0x68 -/* 076AE0 80075EE0 0C0340E4 */ jal func_800D0390 +/* 076AE0 80075EE0 0C0340E4 */ jal osPfsNumFiles /* 076AE4 80075EE4 27A60064 */ addiu $a2, $sp, 0x64 /* 076AE8 80075EE8 10400007 */ beqz $v0, .L80075F08 /* 076AEC 80075EEC 00000000 */ nop diff --git a/asm/non_matchings/controller_pak/func_800762C8.s b/asm/non_matchings/controller_pak/func_800762C8.s index 55a0dc39..e953a459 100644 --- a/asm/non_matchings/controller_pak/func_800762C8.s +++ b/asm/non_matchings/controller_pak/func_800762C8.s @@ -35,7 +35,7 @@ glabel func_800762C8 /* 076F48 80076348 97A50038 */ lhu $a1, 0x38($sp) /* 076F4C 8007634C 8FA60034 */ lw $a2, 0x34($sp) /* 076F50 80076350 27A8003A */ addiu $t0, $sp, 0x3a -/* 076F54 80076354 0C03421C */ jal func_800D0870 +/* 076F54 80076354 0C03421C */ jal osPfsDeleteFile /* 076F58 80076358 AFA80010 */ sw $t0, 0x10($sp) /* 076F5C 8007635C 14400002 */ bnez $v0, .L80076368 /* 076F60 80076360 00000000 */ nop diff --git a/asm/non_matchings/menu/func_80094170.s b/asm/non_matchings/menu/func_80094170.s index 6c91eb4b..4999b116 100644 --- a/asm/non_matchings/menu/func_80094170.s +++ b/asm/non_matchings/menu/func_80094170.s @@ -175,7 +175,7 @@ glabel func_80094170 /* 094FE8 800943E8 29A10004 */ slti $at, $t5, 4 /* 094FEC 800943EC 14200066 */ bnez $at, .L80094588 /* 094FF0 800943F0 ACCD0000 */ sw $t5, ($a2) -/* 094FF4 800943F4 0C02516C */ jal func_800945B0 +/* 094FF4 800943F4 0C02516C */ jal n_alSynRemovePlayer /* 094FF8 800943F8 00000000 */ nop /* 094FFC 800943FC 3C08800E */ lui $t0, %hi(D_800E0988) # $t0, 0x800e /* 095000 80094400 25080988 */ addiu $t0, %lo(D_800E0988) # addiu $t0, $t0, 0x988 diff --git a/asm/non_matchings/unknown_003260/_handleEvent.s b/asm/non_matchings/unknown_003260/_handleEvent.s index ad930044..a1882264 100644 --- a/asm/non_matchings/unknown_003260/_handleEvent.s +++ b/asm/non_matchings/unknown_003260/_handleEvent.s @@ -223,7 +223,7 @@ glabel L800035C4 /* 004384 80003784 8E460008 */ lw $a2, 8($s2) /* 004388 80003788 8EE40038 */ lw $a0, 0x38($s7) /* 00438C 8000378C 02602825 */ move $a1, $s3 -/* 004390 80003790 0C0325BC */ jal func_800C96F0 +/* 004390 80003790 0C0325BC */ jal alSynStartVoice /* 004394 80003794 26F40014 */ addiu $s4, $s7, 0x14 /* 004398 80003798 24090001 */ li $t1, 1 /* 00439C 8000379C A229003F */ sb $t1, 0x3f($s1) @@ -359,7 +359,7 @@ glabel L800035C4 /* 004584 80003984 00401825 */ move $v1, $v0 .L80003988: /* 004588 80003988 8EE40038 */ lw $a0, 0x38($s7) -/* 00458C 8000398C 0C032604 */ jal func_800C9810 +/* 00458C 8000398C 0C032604 */ jal alSynSetFXMix /* 004590 80003990 306600FF */ andi $a2, $v1, 0xff /* 004594 80003994 240E0040 */ li $t6, 64 /* 004598 80003998 A7AE00AC */ sh $t6, 0xac($sp) @@ -567,7 +567,7 @@ glabel L80003BA4 /* 004868 80003C68 00401825 */ move $v1, $v0 .L80003C6C: /* 00486C 80003C6C 8EE40038 */ lw $a0, 0x38($s7) -/* 004870 80003C70 0C032604 */ jal func_800C9810 +/* 004870 80003C70 0C032604 */ jal alSynSetFXMix /* 004874 80003C74 306600FF */ andi $a2, $v1, 0xff .L80003C78: /* 004878 80003C78 96A20000 */ lhu $v0, ($s5) diff --git a/asm/non_matchings/unknown_003260/audioNewThread.s b/asm/non_matchings/unknown_003260/audioNewThread.s index 3da085f4..ebc8fd5d 100644 --- a/asm/non_matchings/unknown_003260/audioNewThread.s +++ b/asm/non_matchings/unknown_003260/audioNewThread.s @@ -16,7 +16,7 @@ glabel audioNewThread /* 003298 80002698 AC2E5F94 */ sw $t6, %lo(D_80115F94)($at) /* 00329C 8000269C 00809825 */ move $s3, $a0 /* 0032A0 800026A0 AC8F0010 */ sw $t7, 0x10($a0) -/* 0032A4 800026A4 0C032180 */ jal func_800C8600 +/* 0032A4 800026A4 0C032180 */ jal osAiSetFrequency /* 0032A8 800026A8 24045622 */ li $a0, 22050 /* 0032AC 800026AC 44822000 */ mtc1 $v0, $f4 /* 0032B0 800026B0 AE620018 */ sw $v0, 0x18($s3) diff --git a/asm/non_matchings/unknown_003260/func_80002C00.s b/asm/non_matchings/unknown_003260/func_80002C00.s index 3ee7a3fe..8a3c0606 100644 --- a/asm/non_matchings/unknown_003260/func_80002C00.s +++ b/asm/non_matchings/unknown_003260/func_80002C00.s @@ -19,7 +19,7 @@ glabel func_80002C00 /* 003844 80002C44 3C01800E */ lui $at, %hi(D_800DC69C) # $at, 0x800e /* 003848 80002C48 00057080 */ sll $t6, $a1, 2 /* 00384C 80002C4C 01C02825 */ move $a1, $t6 -/* 003850 80002C50 0C03235C */ jal func_800C8D70 +/* 003850 80002C50 0C03235C */ jal osAiSetNextBuffer /* 003854 80002C54 AC2EC69C */ sw $t6, %lo(D_800DC69C)($at) /* 003858 80002C58 3C0F800E */ lui $t7, %hi(D_800DC68C) # $t7, 0x800e /* 00385C 80002C5C 81EFC68C */ lb $t7, %lo(D_800DC68C)($t7) @@ -28,7 +28,7 @@ glabel func_80002C00 /* 003868 80002C68 00000000 */ nop /* 00386C 80002C6C 0C01BE53 */ jal get_random_number_from_range /* 003870 80002C70 24052710 */ li $a1, 10000 -/* 003874 80002C74 0C032180 */ jal func_800C8600 +/* 003874 80002C74 0C032180 */ jal osAiSetFrequency /* 003878 80002C78 24445622 */ addiu $a0, $v0, 0x5622 .L80002C7C: /* 00387C 80002C7C 0C032388 */ jal func_800C8E20 diff --git a/asm/non_matchings/unknown_00BC20/func_80016748.s b/asm/non_matchings/unknown_00BC20/func_80016748.s index 28a7cfe0..d7d6dd14 100644 --- a/asm/non_matchings/unknown_00BC20/func_80016748.s +++ b/asm/non_matchings/unknown_00BC20/func_80016748.s @@ -133,7 +133,7 @@ glabel func_80016748 /* 017534 80016934 AFA90010 */ sw $t1, 0x10($sp) /* 017538 80016938 E7A800A0 */ swc1 $f8, 0xa0($sp) /* 01753C 8001693C 8FA700A0 */ lw $a3, 0xa0($sp) -/* 017540 80016940 0C01BD93 */ jal func_8006F64C +/* 017540 80016940 0C01BD93 */ jal guMtxXFMF /* 017544 80016944 00000000 */ nop /* 017548 80016948 8E6C001C */ lw $t4, 0x1c($s3) /* 01754C 8001694C 3C014280 */ li $at, 0x42800000 # 64.000000 diff --git a/asm/non_matchings/unknown_00BC20/func_80017248.s b/asm/non_matchings/unknown_00BC20/func_80017248.s index 8149022e..25de9e08 100644 --- a/asm/non_matchings/unknown_00BC20/func_80017248.s +++ b/asm/non_matchings/unknown_00BC20/func_80017248.s @@ -222,7 +222,7 @@ glabel func_80017248 /* 018190 80017590 AFA8016C */ sw $t0, 0x16c($sp) /* 018194 80017594 AFB70018 */ sw $s7, 0x18($sp) /* 018198 80017598 AFB60014 */ sw $s6, 0x14($sp) -/* 01819C 8001759C 0C01BD93 */ jal func_8006F64C +/* 01819C 8001759C 0C01BD93 */ jal guMtxXFMF /* 0181A0 800175A0 AFB50010 */ sw $s5, 0x10($sp) /* 0181A4 800175A4 8FAD017C */ lw $t5, 0x17c($sp) /* 0181A8 800175A8 27DE0001 */ addiu $fp, $fp, 1 @@ -254,7 +254,7 @@ glabel func_80017248 /* 018208 80017608 AFA8016C */ sw $t0, 0x16c($sp) /* 01820C 8001760C AFB40018 */ sw $s4, 0x18($sp) /* 018210 80017610 AFB30014 */ sw $s3, 0x14($sp) -/* 018214 80017614 0C01BD93 */ jal func_8006F64C +/* 018214 80017614 0C01BD93 */ jal guMtxXFMF /* 018218 80017618 AFB20010 */ sw $s2, 0x10($sp) /* 01821C 8001761C 8FAE017C */ lw $t6, 0x17c($sp) /* 018220 80017620 27DE0001 */ addiu $fp, $fp, 1 @@ -281,7 +281,7 @@ glabel func_80017248 /* 01826C 8001766C AFA8016C */ sw $t0, 0x16c($sp) /* 018270 80017670 AFB70018 */ sw $s7, 0x18($sp) /* 018274 80017674 AFB60014 */ sw $s6, 0x14($sp) -/* 018278 80017678 0C01BD93 */ jal func_8006F64C +/* 018278 80017678 0C01BD93 */ jal guMtxXFMF /* 01827C 8001767C AFB50010 */ sw $s5, 0x10($sp) /* 018280 80017680 8FAA017C */ lw $t2, 0x17c($sp) /* 018284 80017684 27DE0001 */ addiu $fp, $fp, 1 @@ -390,7 +390,7 @@ glabel func_80017248 /* 01840C 8001780C AFAF0014 */ sw $t7, 0x14($sp) /* 018410 80017810 AFB90018 */ sw $t9, 0x18($sp) /* 018414 80017814 AFAD0010 */ sw $t5, 0x10($sp) -/* 018418 80017818 0C01BD93 */ jal func_8006F64C +/* 018418 80017818 0C01BD93 */ jal guMtxXFMF /* 01841C 8001781C AFA8016C */ sw $t0, 0x16c($sp) /* 018420 80017820 8FA8016C */ lw $t0, 0x16c($sp) /* 018424 80017824 00000000 */ nop diff --git a/asm/non_matchings/unknown_00BC20/func_80017E98.s b/asm/non_matchings/unknown_00BC20/func_80017E98.s index f11a0f49..3f9a10cd 100644 --- a/asm/non_matchings/unknown_00BC20/func_80017E98.s +++ b/asm/non_matchings/unknown_00BC20/func_80017E98.s @@ -246,7 +246,7 @@ glabel func_80017E98 /* 018E28 80018228 AFAE0018 */ sw $t6, 0x18($sp) /* 018E2C 8001822C AFAD0014 */ sw $t5, 0x14($sp) /* 018E30 80018230 AFAB0010 */ sw $t3, 0x10($sp) -/* 018E34 80018234 0C01BD93 */ jal func_8006F64C +/* 018E34 80018234 0C01BD93 */ jal guMtxXFMF /* 018E38 80018238 27A40094 */ addiu $a0, $sp, 0x94 /* 018E3C 8001823C C7A400E8 */ lwc1 $f4, 0xe8($sp) /* 018E40 80018240 3C014000 */ li $at, 0x40000000 # 2.000000 diff --git a/asm/non_matchings/unknown_0255E0/func_8002A31C.s b/asm/non_matchings/unknown_0255E0/func_8002A31C.s index fea721ea..c581cf8e 100644 --- a/asm/non_matchings/unknown_0255E0/func_8002A31C.s +++ b/asm/non_matchings/unknown_0255E0/func_8002A31C.s @@ -47,7 +47,7 @@ glabel func_8002A31C /* 02AFCC 8002A3CC AFB50018 */ sw $s5, 0x18($sp) /* 02AFD0 8002A3D0 E7A000CC */ swc1 $f0, 0xcc($sp) /* 02AFD4 8002A3D4 E7A200C8 */ swc1 $f2, 0xc8($sp) -/* 02AFD8 8002A3D8 0C01BD93 */ jal func_8006F64C +/* 02AFD8 8002A3D8 0C01BD93 */ jal guMtxXFMF /* 02AFDC 8002A3DC E7AC00C4 */ swc1 $f12, 0xc4($sp) /* 02AFE0 8002A3E0 C60E000C */ lwc1 $f14, 0xc($s0) /* 02AFE4 8002A3E4 C6100010 */ lwc1 $f16, 0x10($s0) @@ -61,7 +61,7 @@ glabel func_8002A31C /* 02B004 8002A404 AFBE0018 */ sw $fp, 0x18($sp) /* 02B008 8002A408 E7AE00C0 */ swc1 $f14, 0xc0($sp) /* 02B00C 8002A40C E7B000BC */ swc1 $f16, 0xbc($sp) -/* 02B010 8002A410 0C01BD93 */ jal func_8006F64C +/* 02B010 8002A410 0C01BD93 */ jal guMtxXFMF /* 02B014 8002A414 E7B200B8 */ swc1 $f18, 0xb8($sp) /* 02B018 8002A418 C61A0018 */ lwc1 $f26, 0x18($s0) /* 02B01C 8002A41C C61C001C */ lwc1 $f28, 0x1c($s0) @@ -78,7 +78,7 @@ glabel func_8002A31C /* 02B048 8002A448 02402025 */ move $a0, $s2 /* 02B04C 8002A44C E7BA00B4 */ swc1 $f26, 0xb4($sp) /* 02B050 8002A450 E7BC00B0 */ swc1 $f28, 0xb0($sp) -/* 02B054 8002A454 0C01BD93 */ jal func_8006F64C +/* 02B054 8002A454 0C01BD93 */ jal guMtxXFMF /* 02B058 8002A458 E7BE00AC */ swc1 $f30, 0xac($sp) /* 02B05C 8002A45C C7B200B8 */ lwc1 $f18, 0xb8($sp) /* 02B060 8002A460 C7BE00AC */ lwc1 $f30, 0xac($sp) diff --git a/asm/non_matchings/unknown_032760/func_800345A0.s b/asm/non_matchings/unknown_032760/func_800345A0.s index f71cd76d..4c46f8b0 100644 --- a/asm/non_matchings/unknown_032760/func_800345A0.s +++ b/asm/non_matchings/unknown_032760/func_800345A0.s @@ -160,7 +160,7 @@ glabel func_800345A0 /* 03540C 8003480C 246A0024 */ addiu $t2, $v1, 0x24 /* 035410 80034810 AFAA0018 */ sw $t2, 0x18($sp) /* 035414 80034814 AFA90014 */ sw $t1, 0x14($sp) -/* 035418 80034818 0C01BD93 */ jal func_8006F64C +/* 035418 80034818 0C01BD93 */ jal guMtxXFMF /* 03541C 8003481C AFA80010 */ sw $t0, 0x10($sp) .L80034820: /* 035420 80034820 8FBF003C */ lw $ra, 0x3c($sp) diff --git a/asm/non_matchings/unknown_032760/func_80036040.s b/asm/non_matchings/unknown_032760/func_80036040.s index be3f2a6d..c54cd217 100644 --- a/asm/non_matchings/unknown_032760/func_80036040.s +++ b/asm/non_matchings/unknown_032760/func_80036040.s @@ -63,7 +63,7 @@ glabel func_80036040 /* 036D34 80036134 AFA80018 */ sw $t0, 0x18($sp) /* 036D38 80036138 AFB90014 */ sw $t9, 0x14($sp) /* 036D3C 8003613C AFB80010 */ sw $t8, 0x10($sp) -/* 036D40 80036140 0C01BD93 */ jal func_8006F64C +/* 036D40 80036140 0C01BD93 */ jal guMtxXFMF /* 036D44 80036144 27A40050 */ addiu $a0, $sp, 0x50 /* 036D48 80036148 8FA20090 */ lw $v0, 0x90($sp) /* 036D4C 8003614C C606000C */ lwc1 $f6, 0xc($s0) diff --git a/asm/non_matchings/unknown_032760/func_80037D78.s b/asm/non_matchings/unknown_032760/func_80037D78.s index ca312ffa..5df349fa 100644 --- a/asm/non_matchings/unknown_032760/func_80037D78.s +++ b/asm/non_matchings/unknown_032760/func_80037D78.s @@ -137,7 +137,7 @@ glabel func_80037D78 /* 038B88 80037F88 AFB50010 */ sw $s5, 0x10($sp) /* 038B8C 80037F8C E7A40114 */ swc1 $f4, 0x114($sp) /* 038B90 80037F90 8FA70114 */ lw $a3, 0x114($sp) -/* 038B94 80037F94 0C01BD93 */ jal func_8006F64C +/* 038B94 80037F94 0C01BD93 */ jal guMtxXFMF /* 038B98 80037F98 00000000 */ nop /* 038B9C 80037F9C 444BF800 */ cfc1 $t3, $31 /* 038BA0 80037FA0 C7A6011C */ lwc1 $f6, 0x11c($sp) @@ -193,7 +193,7 @@ glabel func_80037D78 /* 038C68 80038068 AFA90018 */ sw $t1, 0x18($sp) /* 038C6C 8003806C AFAD0014 */ sw $t5, 0x14($sp) /* 038C70 80038070 AFB90010 */ sw $t9, 0x10($sp) -/* 038C74 80038074 0C01BD93 */ jal func_8006F64C +/* 038C74 80038074 0C01BD93 */ jal guMtxXFMF /* 038C78 80038078 02802025 */ move $a0, $s4 /* 038C7C 8003807C 8E05000C */ lw $a1, 0xc($s0) /* 038C80 80038080 8E060010 */ lw $a2, 0x10($s0) diff --git a/asm/non_matchings/unknown_032760/func_8003E694.s b/asm/non_matchings/unknown_032760/func_8003E694.s index 7c3004db..37866477 100644 --- a/asm/non_matchings/unknown_032760/func_8003E694.s +++ b/asm/non_matchings/unknown_032760/func_8003E694.s @@ -46,7 +46,7 @@ glabel func_8003E694 /* 03F330 8003E730 AFAA0018 */ sw $t2, 0x18($sp) /* 03F334 8003E734 AFA90014 */ sw $t1, 0x14($sp) /* 03F338 8003E738 AFA80010 */ sw $t0, 0x10($sp) -/* 03F33C 8003E73C 0C01BD93 */ jal func_8006F64C +/* 03F33C 8003E73C 0C01BD93 */ jal guMtxXFMF /* 03F340 8003E740 27A40054 */ addiu $a0, $sp, 0x54 /* 03F344 8003E744 8FAB00EC */ lw $t3, 0xec($sp) /* 03F348 8003E748 3C0C8000 */ lui $t4, %hi(osTvType) # $t4, 0x8000 diff --git a/asm/non_matchings/unknown_032760/func_80041A90.s b/asm/non_matchings/unknown_032760/func_80041A90.s index 2331dc48..2b5341fb 100644 --- a/asm/non_matchings/unknown_032760/func_80041A90.s +++ b/asm/non_matchings/unknown_032760/func_80041A90.s @@ -55,7 +55,7 @@ glabel func_80041A90 /* 042760 80041B60 AFB80018 */ sw $t8, 0x18($sp) /* 042764 80041B64 AFAF0014 */ sw $t7, 0x14($sp) /* 042768 80041B68 AFAE0010 */ sw $t6, 0x10($sp) -/* 04276C 80041B6C 0C01BD93 */ jal func_8006F64C +/* 04276C 80041B6C 0C01BD93 */ jal guMtxXFMF /* 042770 80041B70 27A4008C */ addiu $a0, $sp, 0x8c /* 042774 80041B74 8FA800FC */ lw $t0, 0xfc($sp) /* 042778 80041B78 C7A400DC */ lwc1 $f4, 0xdc($sp) diff --git a/asm/non_matchings/unknown_043920/func_80046524.s b/asm/non_matchings/unknown_043920/func_80046524.s index 7e4d607f..6ed9d9b5 100644 --- a/asm/non_matchings/unknown_043920/func_80046524.s +++ b/asm/non_matchings/unknown_043920/func_80046524.s @@ -781,7 +781,7 @@ glabel func_80046524 /* 047BB4 80046FB4 AFAE0014 */ sw $t6, 0x14($sp) /* 047BB8 80046FB8 AFAD0010 */ sw $t5, 0x10($sp) /* 047BBC 80046FBC 27A40068 */ addiu $a0, $sp, 0x68 -/* 047BC0 80046FC0 0C01BD93 */ jal func_8006F64C +/* 047BC0 80046FC0 0C01BD93 */ jal guMtxXFMF /* 047BC4 80046FC4 3C073F80 */ lui $a3, 0x3f80 /* 047BC8 80046FC8 44800000 */ mtc1 $zero, $f0 /* 047BCC 80046FCC 26180044 */ addiu $t8, $s0, 0x44 @@ -793,7 +793,7 @@ glabel func_80046524 /* 047BE4 80046FE4 AFB90014 */ sw $t9, 0x14($sp) /* 047BE8 80046FE8 AFB80010 */ sw $t8, 0x10($sp) /* 047BEC 80046FEC 27A40068 */ addiu $a0, $sp, 0x68 -/* 047BF0 80046FF0 0C01BD93 */ jal func_8006F64C +/* 047BF0 80046FF0 0C01BD93 */ jal guMtxXFMF /* 047BF4 80046FF4 3C063F80 */ lui $a2, 0x3f80 /* 047BF8 80046FF8 44800000 */ mtc1 $zero, $f0 /* 047BFC 80046FFC 260C0050 */ addiu $t4, $s0, 0x50 @@ -805,7 +805,7 @@ glabel func_80046524 /* 047C14 80047014 AFAB0014 */ sw $t3, 0x14($sp) /* 047C18 80047018 AFAC0010 */ sw $t4, 0x10($sp) /* 047C1C 8004701C 27A40068 */ addiu $a0, $sp, 0x68 -/* 047C20 80047020 0C01BD93 */ jal func_8006F64C +/* 047C20 80047020 0C01BD93 */ jal guMtxXFMF /* 047C24 80047024 3C053F80 */ lui $a1, 0x3f80 /* 047C28 80047028 8E0E0148 */ lw $t6, 0x148($s0) /* 047C2C 8004702C 44805000 */ mtc1 $zero, $f10 @@ -2524,7 +2524,7 @@ glabel func_80046524 /* 049554 80048954 AFAA0018 */ sw $t2, 0x18($sp) /* 049558 80048958 AFAD0014 */ sw $t5, 0x14($sp) /* 04955C 8004895C AFB90010 */ sw $t9, 0x10($sp) -/* 049560 80048960 0C01BD93 */ jal func_8006F64C +/* 049560 80048960 0C01BD93 */ jal guMtxXFMF /* 049564 80048964 27A40068 */ addiu $a0, $sp, 0x68 /* 049568 80048968 820C01E2 */ lb $t4, 0x1e2($s0) /* 04956C 8004896C 44804000 */ mtc1 $zero, $f8 diff --git a/asm/non_matchings/unknown_043920/func_800494E0.s b/asm/non_matchings/unknown_043920/func_800494E0.s index 44cb35e8..e0e4126e 100644 --- a/asm/non_matchings/unknown_043920/func_800494E0.s +++ b/asm/non_matchings/unknown_043920/func_800494E0.s @@ -87,7 +87,7 @@ glabel func_800494E0 /* 04A214 80049614 AFAB0018 */ sw $t3, 0x18($sp) /* 04A218 80049618 AFAA0014 */ sw $t2, 0x14($sp) /* 04A21C 8004961C AFB00010 */ sw $s0, 0x10($sp) -/* 04A220 80049620 0C01BD93 */ jal func_8006F64C +/* 04A220 80049620 0C01BD93 */ jal guMtxXFMF /* 04A224 80049624 27A40048 */ addiu $a0, $sp, 0x48 /* 04A228 80049628 C60C0000 */ lwc1 $f12, ($s0) /* 04A22C 8004962C C60E0004 */ lwc1 $f14, 4($s0) diff --git a/asm/non_matchings/unknown_043920/func_80049794.s b/asm/non_matchings/unknown_043920/func_80049794.s index ea6a9dfa..414cc7c4 100644 --- a/asm/non_matchings/unknown_043920/func_80049794.s +++ b/asm/non_matchings/unknown_043920/func_80049794.s @@ -574,7 +574,7 @@ glabel func_80049794 /* 04AB24 80049F24 AFB90014 */ sw $t9, 0x14($sp) /* 04AB28 80049F28 AFB80010 */ sw $t8, 0x10($sp) /* 04AB2C 80049F2C 27A40060 */ addiu $a0, $sp, 0x60 -/* 04AB30 80049F30 0C01BD93 */ jal func_8006F64C +/* 04AB30 80049F30 0C01BD93 */ jal guMtxXFMF /* 04AB34 80049F34 3C073F80 */ lui $a3, 0x3f80 /* 04AB38 80049F38 44800000 */ mtc1 $zero, $f0 /* 04AB3C 80049F3C 260C0050 */ addiu $t4, $s0, 0x50 @@ -586,7 +586,7 @@ glabel func_80049794 /* 04AB54 80049F54 AFAD0014 */ sw $t5, 0x14($sp) /* 04AB58 80049F58 AFAC0010 */ sw $t4, 0x10($sp) /* 04AB5C 80049F5C 27A40060 */ addiu $a0, $sp, 0x60 -/* 04AB60 80049F60 0C01BD93 */ jal func_8006F64C +/* 04AB60 80049F60 0C01BD93 */ jal guMtxXFMF /* 04AB64 80049F64 3C053F80 */ lui $a1, 0x3f80 /* 04AB68 80049F68 44800000 */ mtc1 $zero, $f0 /* 04AB6C 80049F6C 260F0044 */ addiu $t7, $s0, 0x44 @@ -598,7 +598,7 @@ glabel func_80049794 /* 04AB84 80049F84 AFB80014 */ sw $t8, 0x14($sp) /* 04AB88 80049F88 AFAF0010 */ sw $t7, 0x10($sp) /* 04AB8C 80049F8C 27A40060 */ addiu $a0, $sp, 0x60 -/* 04AB90 80049F90 0C01BD93 */ jal func_8006F64C +/* 04AB90 80049F90 0C01BD93 */ jal guMtxXFMF /* 04AB94 80049F94 3C063F80 */ lui $a2, 0x3f80 /* 04AB98 80049F98 8E0B0148 */ lw $t3, 0x148($s0) /* 04AB9C 80049F9C 00000000 */ nop @@ -2612,7 +2612,7 @@ glabel func_80049794 /* 04C8D4 8004BCD4 AFAB0018 */ sw $t3, 0x18($sp) /* 04C8D8 8004BCD8 AFAD0014 */ sw $t5, 0x14($sp) /* 04C8DC 8004BCDC AFAF0010 */ sw $t7, 0x10($sp) -/* 04C8E0 8004BCE0 0C01BD93 */ jal func_8006F64C +/* 04C8E0 8004BCE0 0C01BD93 */ jal guMtxXFMF /* 04C8E4 8004BCE4 27A40060 */ addiu $a0, $sp, 0x60 /* 04C8E8 8004BCE8 8E230060 */ lw $v1, 0x60($s1) /* 04C8EC 8004BCEC 00000000 */ nop diff --git a/asm/non_matchings/unknown_043920/func_8004CC20.s b/asm/non_matchings/unknown_043920/func_8004CC20.s index 0c254ae3..7878f7e6 100644 --- a/asm/non_matchings/unknown_043920/func_8004CC20.s +++ b/asm/non_matchings/unknown_043920/func_8004CC20.s @@ -136,7 +136,7 @@ glabel func_8004CC20 /* 04D9E8 8004CDE8 AFAC0014 */ sw $t4, 0x14($sp) /* 04D9EC 8004CDEC AFAB0010 */ sw $t3, 0x10($sp) /* 04D9F0 8004CDF0 27A40048 */ addiu $a0, $sp, 0x48 -/* 04D9F4 8004CDF4 0C01BD93 */ jal func_8006F64C +/* 04D9F4 8004CDF4 0C01BD93 */ jal guMtxXFMF /* 04D9F8 8004CDF8 3C063F80 */ lui $a2, 0x3f80 /* 04D9FC 8004CDFC 340E8000 */ li $t6, 32768 /* 04DA00 8004CE00 3C018012 */ lui $at, %hi(D_8011D528) # $at, 0x8012 @@ -606,7 +606,7 @@ glabel func_8004CC20 /* 04E0E4 8004D4E4 AFAD0018 */ sw $t5, 0x18($sp) /* 04E0E8 8004D4E8 AFAC0014 */ sw $t4, 0x14($sp) /* 04E0EC 8004D4EC AFAB0010 */ sw $t3, 0x10($sp) -/* 04E0F0 8004D4F0 0C01BD93 */ jal func_8006F64C +/* 04E0F0 8004D4F0 0C01BD93 */ jal guMtxXFMF /* 04E0F4 8004D4F4 27A40048 */ addiu $a0, $sp, 0x48 /* 04E0F8 8004D4F8 8FA700DC */ lw $a3, 0xdc($sp) /* 04E0FC 8004D4FC 02202025 */ move $a0, $s1 diff --git a/asm/non_matchings/unknown_043920/func_8004D590.s b/asm/non_matchings/unknown_043920/func_8004D590.s index b1787326..1ed44005 100644 --- a/asm/non_matchings/unknown_043920/func_8004D590.s +++ b/asm/non_matchings/unknown_043920/func_8004D590.s @@ -93,7 +93,7 @@ glabel func_8004D590 /* 04E2EC 8004D6EC AFB90018 */ sw $t9, 0x18($sp) /* 04E2F0 8004D6F0 AFAF0014 */ sw $t7, 0x14($sp) /* 04E2F4 8004D6F4 AFB80010 */ sw $t8, 0x10($sp) -/* 04E2F8 8004D6F8 0C01BD93 */ jal func_8006F64C +/* 04E2F8 8004D6F8 0C01BD93 */ jal guMtxXFMF /* 04E2FC 8004D6FC 27A40048 */ addiu $a0, $sp, 0x48 /* 04E300 8004D700 8FA200AC */ lw $v0, 0xac($sp) /* 04E304 8004D704 C7B00090 */ lwc1 $f16, 0x90($sp) @@ -126,7 +126,7 @@ glabel func_8004D590 /* 04E370 8004D770 AFB80018 */ sw $t8, 0x18($sp) /* 04E374 8004D774 AFAE0014 */ sw $t6, 0x14($sp) /* 04E378 8004D778 AFAD0010 */ sw $t5, 0x10($sp) -/* 04E37C 8004D77C 0C01BD93 */ jal func_8006F64C +/* 04E37C 8004D77C 0C01BD93 */ jal guMtxXFMF /* 04E380 8004D780 27A40048 */ addiu $a0, $sp, 0x48 /* 04E384 8004D784 8E020000 */ lw $v0, ($s0) /* 04E388 8004D788 C7A80090 */ lwc1 $f8, 0x90($sp) diff --git a/asm/non_matchings/unknown_043920/func_8004F7F4.s b/asm/non_matchings/unknown_043920/func_8004F7F4.s index ed371411..45b6c9a2 100644 --- a/asm/non_matchings/unknown_043920/func_8004F7F4.s +++ b/asm/non_matchings/unknown_043920/func_8004F7F4.s @@ -580,7 +580,7 @@ glabel func_8004F7F4 /* 050C0C 8005000C AFAD0014 */ sw $t5, 0x14($sp) /* 050C10 80050010 AFAC0010 */ sw $t4, 0x10($sp) /* 050C14 80050014 27A40060 */ addiu $a0, $sp, 0x60 -/* 050C18 80050018 0C01BD93 */ jal func_8006F64C +/* 050C18 80050018 0C01BD93 */ jal guMtxXFMF /* 050C1C 8005001C 24060000 */ li $a2, 0 .L80050020: /* 050C20 80050020 820F0175 */ lb $t7, 0x175($s0) @@ -806,7 +806,7 @@ glabel func_8004F7F4 /* 050F58 80050358 AFAA0014 */ sw $t2, 0x14($sp) /* 050F5C 8005035C AFA90010 */ sw $t1, 0x10($sp) /* 050F60 80050360 27A40060 */ addiu $a0, $sp, 0x60 -/* 050F64 80050364 0C01BD93 */ jal func_8006F64C +/* 050F64 80050364 0C01BD93 */ jal guMtxXFMF /* 050F68 80050368 24060000 */ li $a2, 0 /* 050F6C 8005036C 820201D2 */ lb $v0, 0x1d2($s0) /* 050F70 80050370 3C013FE0 */ li $at, 0x3FE00000 # 1.750000 diff --git a/asm/non_matchings/unknown_043920/func_80054110.s b/asm/non_matchings/unknown_043920/func_80054110.s index 390f5ea9..e02c0a57 100644 --- a/asm/non_matchings/unknown_043920/func_80054110.s +++ b/asm/non_matchings/unknown_043920/func_80054110.s @@ -305,7 +305,7 @@ glabel func_80054110 /* 055154 80054554 AFAB0014 */ sw $t3, 0x14($sp) /* 055158 80054558 AFAA0010 */ sw $t2, 0x10($sp) /* 05515C 8005455C 27A40050 */ addiu $a0, $sp, 0x50 -/* 055160 80054560 0C01BD93 */ jal func_8006F64C +/* 055160 80054560 0C01BD93 */ jal guMtxXFMF /* 055164 80054564 24060000 */ li $a2, 0 .L80054568: /* 055168 80054568 820D0175 */ lb $t5, 0x175($s0) @@ -474,7 +474,7 @@ glabel func_80054110 /* 0553CC 800547CC AFA80014 */ sw $t0, 0x14($sp) /* 0553D0 800547D0 AFB90010 */ sw $t9, 0x10($sp) /* 0553D4 800547D4 27A40050 */ addiu $a0, $sp, 0x50 -/* 0553D8 800547D8 0C01BD93 */ jal func_8006F64C +/* 0553D8 800547D8 0C01BD93 */ jal guMtxXFMF /* 0553DC 800547DC 24060000 */ li $a2, 0 /* 0553E0 800547E0 820201D2 */ lb $v0, 0x1d2($s0) /* 0553E4 800547E4 C7B000A0 */ lwc1 $f16, 0xa0($sp) diff --git a/asm/non_matchings/unknown_043920/func_80054FD0.s b/asm/non_matchings/unknown_043920/func_80054FD0.s index 22c40dfa..448ab80d 100644 --- a/asm/non_matchings/unknown_043920/func_80054FD0.s +++ b/asm/non_matchings/unknown_043920/func_80054FD0.s @@ -65,7 +65,7 @@ glabel func_80054FD0 /* 055CA8 800550A8 AFAB0018 */ sw $t3, 0x18($sp) /* 055CAC 800550AC AFAA0014 */ sw $t2, 0x14($sp) /* 055CB0 800550B0 AFA90010 */ sw $t1, 0x10($sp) -/* 055CB4 800550B4 0C01BD93 */ jal func_8006F64C +/* 055CB4 800550B4 0C01BD93 */ jal guMtxXFMF /* 055CB8 800550B8 27A400A0 */ addiu $a0, $sp, 0xa0 /* 055CBC 800550BC 3C198012 */ lui $t9, %hi(D_8011D568) # $t9, 0x8012 /* 055CC0 800550C0 8FA80054 */ lw $t0, 0x54($sp) @@ -556,7 +556,7 @@ glabel func_80054FD0 /* 0563F8 800557F8 AFA30018 */ sw $v1, 0x18($sp) /* 0563FC 800557FC AFA90014 */ sw $t1, 0x14($sp) /* 056400 80055800 AFA80010 */ sw $t0, 0x10($sp) -/* 056404 80055804 0C01BD93 */ jal func_8006F64C +/* 056404 80055804 0C01BD93 */ jal guMtxXFMF /* 056408 80055808 27A40060 */ addiu $a0, $sp, 0x60 /* 05640C 8005580C 8FA30048 */ lw $v1, 0x48($sp) /* 056410 80055810 8FA20054 */ lw $v0, 0x54($sp) diff --git a/asm/non_matchings/unknown_043920/func_800575EC.s b/asm/non_matchings/unknown_043920/func_800575EC.s index 645d2c19..1b53c7f5 100644 --- a/asm/non_matchings/unknown_043920/func_800575EC.s +++ b/asm/non_matchings/unknown_043920/func_800575EC.s @@ -30,7 +30,7 @@ glabel func_800575EC /* 05825C 8005765C AFB90014 */ sw $t9, 0x14($sp) /* 058260 80057660 AFB80010 */ sw $t8, 0x10($sp) /* 058264 80057664 27A40038 */ addiu $a0, $sp, 0x38 -/* 058268 80057668 0C01BD93 */ jal func_8006F64C +/* 058268 80057668 0C01BD93 */ jal guMtxXFMF /* 05826C 8005766C 3C073F80 */ lui $a3, 0x3f80 /* 058270 80057670 4405A000 */ mfc1 $a1, $f20 /* 058274 80057674 4407A000 */ mfc1 $a3, $f20 @@ -41,7 +41,7 @@ glabel func_800575EC /* 058288 80057688 AFAA0014 */ sw $t2, 0x14($sp) /* 05828C 8005768C AFA90010 */ sw $t1, 0x10($sp) /* 058290 80057690 27A40038 */ addiu $a0, $sp, 0x38 -/* 058294 80057694 0C01BD93 */ jal func_8006F64C +/* 058294 80057694 0C01BD93 */ jal guMtxXFMF /* 058298 80057698 3C063F80 */ lui $a2, 0x3f80 /* 05829C 8005769C 4406A000 */ mfc1 $a2, $f20 /* 0582A0 800576A0 4407A000 */ mfc1 $a3, $f20 @@ -52,7 +52,7 @@ glabel func_800575EC /* 0582B4 800576B4 AFAD0014 */ sw $t5, 0x14($sp) /* 0582B8 800576B8 AFAC0010 */ sw $t4, 0x10($sp) /* 0582BC 800576BC 27A40038 */ addiu $a0, $sp, 0x38 -/* 0582C0 800576C0 0C01BD93 */ jal func_8006F64C +/* 0582C0 800576C0 0C01BD93 */ jal guMtxXFMF /* 0582C4 800576C4 3C053F80 */ lui $a1, 0x3f80 /* 0582C8 800576C8 8FBF0034 */ lw $ra, 0x34($sp) /* 0582CC 800576CC C7B50028 */ lwc1 $f21, 0x28($sp) diff --git a/asm/non_matchings/unknown_061D30/__CSPHandleMIDIMsg.s b/asm/non_matchings/unknown_061D30/__CSPHandleMIDIMsg.s index d775e367..e12f24ed 100644 --- a/asm/non_matchings/unknown_061D30/__CSPHandleMIDIMsg.s +++ b/asm/non_matchings/unknown_061D30/__CSPHandleMIDIMsg.s @@ -762,7 +762,7 @@ glabel L8006319C /* 06420C 8006360C 168C0004 */ bne $s4, $t4, .L80063620 /* 064210 80063610 00000000 */ nop /* 064214 80063614 8E440014 */ lw $a0, 0x14($s2) -/* 064218 80063618 0C032604 */ jal func_800C9810 +/* 064218 80063618 0C032604 */ jal alSynSetFXMix /* 06421C 8006361C 326600FF */ andi $a2, $s3, 0xff .L80063620: /* 064220 80063620 8E100000 */ lw $s0, ($s0) @@ -799,7 +799,7 @@ glabel L8006319C /* 064290 80063690 16380004 */ bne $s1, $t8, .L800636A4 /* 064294 80063694 00000000 */ nop /* 064298 80063698 8E440014 */ lw $a0, 0x14($s2) -/* 06429C 8006369C 0C032604 */ jal func_800C9810 +/* 06429C 8006369C 0C032604 */ jal alSynSetFXMix /* 0642A0 800636A0 326600FF */ andi $a2, $s3, 0xff .L800636A4: /* 0642A4 800636A4 8E100000 */ lw $s0, ($s0) diff --git a/asm/non_matchings/unknown_06B2B0/func_8006CCF0.s b/asm/non_matchings/unknown_06B2B0/func_8006CCF0.s index 654f0634..950ba6f2 100644 --- a/asm/non_matchings/unknown_06B2B0/func_8006CCF0.s +++ b/asm/non_matchings/unknown_06B2B0/func_8006CCF0.s @@ -254,7 +254,7 @@ glabel L8006D024 /* 06DC5C 8006D05C 24010002 */ li $at, 2 /* 06DC60 8006D060 10410003 */ beq $v0, $at, .L8006D070 /* 06DC64 8006D064 3C018012 */ lui $at, %hi(gIsPaused) # $at, 0x8012 -/* 06DC68 8006D068 0C025179 */ jal func_800945E4 +/* 06DC68 8006D068 0C025179 */ jal n_alSeqpDelete /* 06DC6C 8006D06C A0203515 */ sb $zero, %lo(gIsPaused)($at) .L8006D070: /* 06DC70 8006D070 3C0C8012 */ lui $t4, %hi(gIsPaused) # $t4, 0x8012 diff --git a/asm/non_matchings/unknown_079F50/func_80079B44.s b/asm/non_matchings/unknown_079F50/func_80079B44.s index 65f60a7a..414613e5 100644 --- a/asm/non_matchings/unknown_079F50/func_80079B44.s +++ b/asm/non_matchings/unknown_079F50/func_80079B44.s @@ -81,7 +81,7 @@ glabel func_80079B44 /* 07A85C 80079C5C 11200026 */ beqz $t1, .L80079CF8 /* 07A860 80079C60 00415024 */ and $t2, $v0, $at /* 07A864 80079C64 24A40010 */ addiu $a0, $a1, 0x10 -/* 07A868 80079C68 0C03477C */ jal func_800D1DF0 +/* 07A868 80079C68 0C03477C */ jal osSpTaskYielded /* 07A86C 80079C6C AFA50034 */ sw $a1, 0x34($sp) /* 07A870 80079C70 8FA50034 */ lw $a1, 0x34($sp) /* 07A874 80079C74 10400015 */ beqz $v0, .L80079CCC diff --git a/asm/unknown_070110.s b/asm/unknown_070110.s index 174754cc..84875cd2 100644 --- a/asm/unknown_070110.s +++ b/asm/unknown_070110.s @@ -13,7 +13,7 @@ .include "asm/unknown_070110/func_8006F53C.s" .include "asm/unknown_070110/func_8006F564.s" .include "asm/unknown_070110/func_8006F5E0.s" -.include "asm/unknown_070110/func_8006F64C.s" +.include "asm/unknown_070110/guMtxXFMF.s" .include "asm/unknown_070110/func_8006F6EC.s" .include "asm/unknown_070110/func_8006F768.s" .include "asm/unknown_070110/func_8006F870.s" diff --git a/asm/unknown_070110/func_8006F64C.s b/asm/unknown_070110/guMtxXFMF.s similarity index 99% rename from asm/unknown_070110/func_8006F64C.s rename to asm/unknown_070110/guMtxXFMF.s index fe12d42c..530cc7e8 100644 --- a/asm/unknown_070110/func_8006F64C.s +++ b/asm/unknown_070110/guMtxXFMF.s @@ -1,4 +1,4 @@ -glabel func_8006F64C +glabel guMtxXFMF /* 07024C 8006F64C 44856000 */ mtc1 $a1, $f12 /* 070250 8006F650 C4840000 */ lwc1 $f4, ($a0) /* 070254 8006F654 44867000 */ mtc1 $a2, $f14 diff --git a/lib/asm/non_matchings/unknown_0C86A0/func_800C8284.s b/lib/asm/non_matchings/unknown_0C86A0/alCSeqSecToTicks.s similarity index 99% rename from lib/asm/non_matchings/unknown_0C86A0/func_800C8284.s rename to lib/asm/non_matchings/unknown_0C86A0/alCSeqSecToTicks.s index 98084e6a..415206af 100644 --- a/lib/asm/non_matchings/unknown_0C86A0/func_800C8284.s +++ b/lib/asm/non_matchings/unknown_0C86A0/alCSeqSecToTicks.s @@ -3,7 +3,7 @@ glabel D_800E94B0 .double 1000000.0 .text -glabel func_800C8284 +glabel alCSeqSecToTicks /* 0C8E84 800C8284 8C8E0000 */ lw $t6, ($a0) /* 0C8E88 800C8288 44856000 */ mtc1 $a1, $f12 /* 0C8E8C 800C828C 3C01800F */ lui $at, %hi(D_800E94B0) # $at, 0x800f diff --git a/lib/asm/non_matchings/unknown_0C86A0/func_800C8380.s b/lib/asm/non_matchings/unknown_0C86A0/alCSeqTicksToSec.s similarity index 98% rename from lib/asm/non_matchings/unknown_0C86A0/func_800C8380.s rename to lib/asm/non_matchings/unknown_0C86A0/alCSeqTicksToSec.s index 9879f4f0..86b49903 100644 --- a/lib/asm/non_matchings/unknown_0C86A0/func_800C8380.s +++ b/lib/asm/non_matchings/unknown_0C86A0/alCSeqTicksToSec.s @@ -3,7 +3,7 @@ glabel D_800E94B8 .double 1000000.0 .text -glabel func_800C8380 +glabel alCSeqTicksToSec /* 0C8F80 800C8380 44852000 */ mtc1 $a1, $f4 /* 0C8F84 800C8384 44864000 */ mtc1 $a2, $f8 /* 0C8F88 800C8388 3C014F80 */ li $at, 0x4F800000 # 4294967296.000000 diff --git a/lib/asm/non_matchings/unknown_0C91A0/func_800C8600.s b/lib/asm/non_matchings/unknown_0C91A0/osAiSetFrequency.s similarity index 99% rename from lib/asm/non_matchings/unknown_0C91A0/func_800C8600.s rename to lib/asm/non_matchings/unknown_0C91A0/osAiSetFrequency.s index 6af16037..1f05f6a4 100644 --- a/lib/asm/non_matchings/unknown_0C91A0/func_800C8600.s +++ b/lib/asm/non_matchings/unknown_0C91A0/osAiSetFrequency.s @@ -1,4 +1,4 @@ -glabel func_800C8600 +glabel osAiSetFrequency /* 0C9200 800C8600 3C0E800E */ lui $t6, %hi(osViClock) # $t6, 0x800e /* 0C9204 800C8604 8DCE4878 */ lw $t6, %lo(osViClock)($t6) /* 0C9208 800C8608 44844000 */ mtc1 $a0, $f8 diff --git a/lib/asm/non_matchings/unknown_0C9970/func_800C8D70.s b/lib/asm/non_matchings/unknown_0C9970/osAiSetNextBuffer.s similarity index 96% rename from lib/asm/non_matchings/unknown_0C9970/func_800C8D70.s rename to lib/asm/non_matchings/unknown_0C9970/osAiSetNextBuffer.s index 861336a7..0b80d732 100644 --- a/lib/asm/non_matchings/unknown_0C9970/func_800C8D70.s +++ b/lib/asm/non_matchings/unknown_0C9970/osAiSetNextBuffer.s @@ -1,4 +1,4 @@ -glabel func_800C8D70 +glabel osAiSetNextBuffer /* 0C9970 800C8D70 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 0C9974 800C8D74 3C0F800E */ lui $t7, %hi(D_800E3790) # $t7, 0x800e /* 0C9978 800C8D78 91EF3790 */ lbu $t7, %lo(D_800E3790)($t7) @@ -26,7 +26,7 @@ glabel func_800C8D70 /* 0C99C8 800C8DC8 3C01800E */ lui $at, %hi(D_800E3790) # $at, 0x800e /* 0C99CC 800C8DCC A0203790 */ sb $zero, %lo(D_800E3790)($at) .L800C8DD0: -/* 0C99D0 800C8DD0 0C034D9C */ jal func_800D3670 +/* 0C99D0 800C8DD0 0C034D9C */ jal __osAiDeviceBusy /* 0C99D4 800C8DD4 00000000 */ nop /* 0C99D8 800C8DD8 10400003 */ beqz $v0, .L800C8DE8 /* 0C99DC 800C8DDC 00000000 */ nop diff --git a/lib/asm/non_matchings/unknown_0CA2F0/func_800C96F0.s b/lib/asm/non_matchings/unknown_0CA2F0/alSynStartVoice.s similarity index 98% rename from lib/asm/non_matchings/unknown_0CA2F0/func_800C96F0.s rename to lib/asm/non_matchings/unknown_0CA2F0/alSynStartVoice.s index 9f1e7387..51f5468a 100644 --- a/lib/asm/non_matchings/unknown_0CA2F0/func_800C96F0.s +++ b/lib/asm/non_matchings/unknown_0CA2F0/alSynStartVoice.s @@ -1,4 +1,4 @@ -glabel func_800C96F0 +glabel alSynStartVoice /* 0CA2F0 800C96F0 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0CA2F4 800C96F4 AFBF0014 */ sw $ra, 0x14($sp) /* 0CA2F8 800C96F8 AFA40018 */ sw $a0, 0x18($sp) diff --git a/lib/asm/non_matchings/unknown_0CA410/func_800C9810.s b/lib/asm/non_matchings/unknown_0CA410/alSynSetFXMix.s similarity index 98% rename from lib/asm/non_matchings/unknown_0CA410/func_800C9810.s rename to lib/asm/non_matchings/unknown_0CA410/alSynSetFXMix.s index 8057c32e..0f48ec66 100644 --- a/lib/asm/non_matchings/unknown_0CA410/func_800C9810.s +++ b/lib/asm/non_matchings/unknown_0CA410/alSynSetFXMix.s @@ -1,4 +1,4 @@ -glabel func_800C9810 +glabel alSynSetFXMix /* 0CA410 800C9810 27BDFFE8 */ addiu $sp, $sp, -0x18 /* 0CA414 800C9814 AFBF0014 */ sw $ra, 0x14($sp) /* 0CA418 800C9818 AFA40018 */ sw $a0, 0x18($sp) diff --git a/lib/asm/non_matchings/unknown_0CA9A0/alLoadParam.s b/lib/asm/non_matchings/unknown_0CA9A0/alLoadParam.s index aa0018ad..ec0bbd7b 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/alLoadParam.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/alLoadParam.s @@ -17,7 +17,7 @@ glabel alLoadParam /* 0CC17C 800CB57C 8CE20028 */ lw $v0, 0x28($a3) /* 0CC180 800CB580 24040001 */ li $a0, 1 /* 0CC184 800CB584 10440034 */ beq $v0, $a0, .L800CB658 -/* 0CC188 800CB588 3C08800D */ lui $t0, %hi(func_800CB714) # $t0, 0x800d +/* 0CC188 800CB588 3C08800D */ lui $t0, %hi(alRaw16Pull) # $t0, 0x800d /* 0CC18C 800CB58C 1000005E */ b .L800CB708 /* 0CC190 800CB590 8FBF0014 */ lw $ra, 0x14($sp) /* 0CC194 800CB594 8CE20028 */ lw $v0, 0x28($a3) @@ -75,7 +75,7 @@ glabel alLoadParam /* 0CC254 800CB654 ACE0001C */ sw $zero, 0x1c($a3) .L800CB658: /* 0CC258 800CB658 8CE20028 */ lw $v0, 0x28($a3) -/* 0CC25C 800CB65C 2508B714 */ addiu $t0, %lo(func_800CB714) # addiu $t0, $t0, -0x48ec +/* 0CC25C 800CB65C 2508B714 */ addiu $t0, %lo(alRaw16Pull) # addiu $t0, $t0, -0x48ec /* 0CC260 800CB660 ACE80004 */ sw $t0, 4($a3) /* 0CC264 800CB664 8C43000C */ lw $v1, 0xc($v0) /* 0CC268 800CB668 5060000B */ beql $v1, $zero, .L800CB698 diff --git a/lib/asm/non_matchings/unknown_0CA9A0/func_800CB714.s b/lib/asm/non_matchings/unknown_0CA9A0/alRaw16Pull.s similarity index 99% rename from lib/asm/non_matchings/unknown_0CA9A0/func_800CB714.s rename to lib/asm/non_matchings/unknown_0CA9A0/alRaw16Pull.s index fa090490..405b6976 100644 --- a/lib/asm/non_matchings/unknown_0CA9A0/func_800CB714.s +++ b/lib/asm/non_matchings/unknown_0CA9A0/alRaw16Pull.s @@ -1,4 +1,4 @@ -glabel func_800CB714 +glabel alRaw16Pull /* 0CC314 800CB714 27BDFFB0 */ addiu $sp, $sp, -0x50 /* 0CC318 800CB718 8FA80060 */ lw $t0, 0x60($sp) /* 0CC31C 800CB71C AFB30020 */ sw $s3, 0x20($sp) diff --git a/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s b/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s index 764b8d57..d420ed81 100644 --- a/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s +++ b/lib/asm/non_matchings/unknown_0CCF90/osInitialize.s @@ -164,7 +164,7 @@ glabel osInitialize /* 0CD408 800CC808 3C05800C */ lui $a1, %hi(func_800C7340) # $a1, 0x800c /* 0CD40C 800CC80C AC2D38B0 */ sw $t5, %lo(D_800E38B0)($at) /* 0CD410 800CC810 24A57340 */ addiu $a1, %lo(func_800C7340) # addiu $a1, $a1, 0x7340 -/* 0CD414 800CC814 0C0351FC */ jal func_800D47F0 +/* 0CD414 800CC814 0C0351FC */ jal __osSetHWIntrRoutine /* 0CD418 800CC818 24040001 */ li $a0, 1 /* 0CD41C 800CC81C 10000003 */ b .L800CC82C /* 0CD420 800CC820 00000000 */ nop diff --git a/lib/asm/non_matchings/unknown_0CD820/func_800CCE18.s b/lib/asm/non_matchings/unknown_0CD820/__osContGetInitData.s similarity index 99% rename from lib/asm/non_matchings/unknown_0CD820/func_800CCE18.s rename to lib/asm/non_matchings/unknown_0CD820/__osContGetInitData.s index 50961eac..4a8bf07b 100644 --- a/lib/asm/non_matchings/unknown_0CD820/func_800CCE18.s +++ b/lib/asm/non_matchings/unknown_0CD820/__osContGetInitData.s @@ -1,4 +1,4 @@ -glabel func_800CCE18 +glabel __osContGetInitData /* 0CDA18 800CCE18 3C0F8013 */ lui $t7, %hi(__osMaxControllers) # $t7, 0x8013 /* 0CDA1C 800CCE1C 91EFCD91 */ lbu $t7, %lo(__osMaxControllers)($t7) /* 0CDA20 800CCE20 27BDFFE8 */ addiu $sp, $sp, -0x18 diff --git a/lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s b/lib/asm/non_matchings/unknown_0CD820/__osPackRequestData.s similarity index 99% rename from lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s rename to lib/asm/non_matchings/unknown_0CD820/__osPackRequestData.s index 64272f81..3faa7cbc 100644 --- a/lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s +++ b/lib/asm/non_matchings/unknown_0CD820/__osPackRequestData.s @@ -1,4 +1,4 @@ -glabel func_800CCEE8 +glabel __osPackRequestData /* 0CDAE8 800CCEE8 27BDFFF0 */ addiu $sp, $sp, -0x10 /* 0CDAEC 800CCEEC 308400FF */ andi $a0, $a0, 0xff /* 0CDAF0 800CCEF0 AFA00000 */ sw $zero, ($sp) diff --git a/lib/asm/non_matchings/unknown_0CD820/func_800CD0A4.s b/lib/asm/non_matchings/unknown_0CD820/osContGetReadData.s similarity index 98% rename from lib/asm/non_matchings/unknown_0CD820/func_800CD0A4.s rename to lib/asm/non_matchings/unknown_0CD820/osContGetReadData.s index 70e89221..c447d1eb 100644 --- a/lib/asm/non_matchings/unknown_0CD820/func_800CD0A4.s +++ b/lib/asm/non_matchings/unknown_0CD820/osContGetReadData.s @@ -1,4 +1,4 @@ -glabel func_800CD0A4 +glabel osContGetReadData /* 0CDCA4 800CD0A4 3C0F8013 */ lui $t7, %hi(__osMaxControllers) # $t7, 0x8013 /* 0CDCA8 800CD0A8 91EFCD91 */ lbu $t7, %lo(__osMaxControllers)($t7) /* 0CDCAC 800CD0AC 3C0E8013 */ lui $t6, %hi(D_8012CD50) # $t6, 0x8013 diff --git a/lib/asm/non_matchings/unknown_0CD820/func_800CCC20.s b/lib/asm/non_matchings/unknown_0CD820/osContInit.s similarity index 98% rename from lib/asm/non_matchings/unknown_0CD820/func_800CCC20.s rename to lib/asm/non_matchings/unknown_0CD820/osContInit.s index 1fc82ed3..dd831715 100644 --- a/lib/asm/non_matchings/unknown_0CD820/func_800CCC20.s +++ b/lib/asm/non_matchings/unknown_0CD820/osContInit.s @@ -1,4 +1,4 @@ -glabel func_800CCC20 +glabel osContInit /* 0CD820 800CCC20 27BDFF80 */ addiu $sp, $sp, -0x80 /* 0CD824 800CCC24 3C0E800E */ lui $t6, %hi(D_800E38C0) # $t6, 0x800e /* 0CD828 800CCC28 8DCE38C0 */ lw $t6, %lo(D_800E38C0)($t6) @@ -91,7 +91,7 @@ glabel func_800CCC20 /* 0CD978 800CCD78 24180004 */ li $t8, 4 /* 0CD97C 800CCD7C 3C018013 */ lui $at, %hi(__osMaxControllers) # $at, 0x8013 /* 0CD980 800CCD80 A038CD91 */ sb $t8, %lo(__osMaxControllers)($at) -/* 0CD984 800CCD84 0C0333BA */ jal func_800CCEE8 +/* 0CD984 800CCD84 0C0333BA */ jal __osPackRequestData /* 0CD988 800CCD88 00002025 */ move $a0, $zero /* 0CD98C 800CCD8C 3C058013 */ lui $a1, %hi(D_8012CD50) # $a1, 0x8013 /* 0CD990 800CCD90 24A5CD50 */ addiu $a1, %lo(D_8012CD50) # addiu $a1, $a1, -0x32b0 @@ -112,7 +112,7 @@ glabel func_800CCC20 /* 0CD9CC 800CCDCC 0C0322EC */ jal osRecvMesg /* 0CD9D0 800CCDD0 24060001 */ li $a2, 1 /* 0CD9D4 800CCDD4 8FA40084 */ lw $a0, 0x84($sp) -/* 0CD9D8 800CCDD8 0C033386 */ jal func_800CCE18 +/* 0CD9D8 800CCDD8 0C033386 */ jal __osContGetInitData /* 0CD9DC 800CCDDC 8FA50088 */ lw $a1, 0x88($sp) /* 0CD9E0 800CCDE0 3C018013 */ lui $at, %hi(__osContLastCmd) # $at, 0x8013 /* 0CD9E4 800CCDE4 0C033580 */ jal __osSiCreateAccessQueue diff --git a/lib/asm/non_matchings/unknown_0CD820/func_800CCFE0.s b/lib/asm/non_matchings/unknown_0CD820/osContStartReadData.s similarity index 99% rename from lib/asm/non_matchings/unknown_0CD820/func_800CCFE0.s rename to lib/asm/non_matchings/unknown_0CD820/osContStartReadData.s index 2b897939..e0e68a7b 100644 --- a/lib/asm/non_matchings/unknown_0CD820/func_800CCFE0.s +++ b/lib/asm/non_matchings/unknown_0CD820/osContStartReadData.s @@ -1,4 +1,4 @@ -glabel func_800CCFE0 +glabel osContStartReadData /* 0CDBE0 800CCFE0 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 0CDBE4 800CCFE4 AFBF0014 */ sw $ra, 0x14($sp) /* 0CDBE8 800CCFE8 AFA40020 */ sw $a0, 0x20($sp) diff --git a/lib/asm/non_matchings/unknown_0CF330/func_800CED20.s b/lib/asm/non_matchings/unknown_0CF330/func_800CED20.s index 449270b0..8f362cdb 100644 --- a/lib/asm/non_matchings/unknown_0CF330/func_800CED20.s +++ b/lib/asm/non_matchings/unknown_0CF330/func_800CED20.s @@ -34,7 +34,7 @@ glabel func_800CED20 /* 0CF99C 800CED9C 10000009 */ b .L800CEDC4 /* 0CF9A0 800CEDA0 01401025 */ move $v0, $t2 .L800CEDA4: -/* 0CF9A4 800CEDA4 0C033D4C */ jal func_800CF530 +/* 0CF9A4 800CEDA4 0C033D4C */ jal osPfsChecker /* 0CF9A8 800CEDA8 8FA40024 */ lw $a0, 0x24($sp) /* 0CF9AC 800CEDAC 8FAB0024 */ lw $t3, 0x24($sp) /* 0CF9B0 800CEDB0 AFA2001C */ sw $v0, 0x1c($sp) diff --git a/lib/asm/non_matchings/unknown_0D0130/func_800CFDA8.s b/lib/asm/non_matchings/unknown_0D0130/corrupted.s similarity index 99% rename from lib/asm/non_matchings/unknown_0D0130/func_800CFDA8.s rename to lib/asm/non_matchings/unknown_0D0130/corrupted.s index 8828f138..2ced291e 100644 --- a/lib/asm/non_matchings/unknown_0D0130/func_800CFDA8.s +++ b/lib/asm/non_matchings/unknown_0D0130/corrupted.s @@ -1,4 +1,4 @@ -glabel func_800CFDA8 +glabel corrupted /* 0D09A8 800CFDA8 27BDFFD0 */ addiu $sp, $sp, -0x30 /* 0D09AC 800CFDAC AFA50034 */ sw $a1, 0x34($sp) /* 0D09B0 800CFDB0 93B80034 */ lbu $t8, 0x34($sp) diff --git a/lib/asm/non_matchings/unknown_0D0130/func_800CFBF4.s b/lib/asm/non_matchings/unknown_0D0130/corrupted_init.s similarity index 99% rename from lib/asm/non_matchings/unknown_0D0130/func_800CFBF4.s rename to lib/asm/non_matchings/unknown_0D0130/corrupted_init.s index 2c0d3055..8b99ffa5 100644 --- a/lib/asm/non_matchings/unknown_0D0130/func_800CFBF4.s +++ b/lib/asm/non_matchings/unknown_0D0130/corrupted_init.s @@ -1,4 +1,4 @@ -glabel func_800CFBF4 +glabel corrupted_init /* 0D07F4 800CFBF4 27BDFED0 */ addiu $sp, $sp, -0x130 /* 0D07F8 800CFBF8 AFBF0014 */ sw $ra, 0x14($sp) /* 0D07FC 800CFBFC AFA40130 */ sw $a0, 0x130($sp) diff --git a/lib/asm/non_matchings/unknown_0D0130/func_800CF530.s b/lib/asm/non_matchings/unknown_0D0130/osPfsChecker.s similarity index 99% rename from lib/asm/non_matchings/unknown_0D0130/func_800CF530.s rename to lib/asm/non_matchings/unknown_0D0130/osPfsChecker.s index 0e7667ab..1763e946 100644 --- a/lib/asm/non_matchings/unknown_0D0130/func_800CF530.s +++ b/lib/asm/non_matchings/unknown_0D0130/osPfsChecker.s @@ -1,4 +1,4 @@ -glabel func_800CF530 +glabel osPfsChecker /* 0D0130 800CF530 27BDFB78 */ addiu $sp, $sp, -0x488 /* 0D0134 800CF534 AFBF001C */ sw $ra, 0x1c($sp) /* 0D0138 800CF538 AFA40488 */ sw $a0, 0x488($sp) @@ -21,7 +21,7 @@ glabel func_800CF530 /* 0D0178 800CF578 01E01025 */ move $v0, $t7 .L800CF57C: /* 0D017C 800CF57C 8FA40488 */ lw $a0, 0x488($sp) -/* 0D0180 800CF580 0C033EFD */ jal func_800CFBF4 +/* 0D0180 800CF580 0C033EFD */ jal corrupted_init /* 0D0184 800CF584 27A50038 */ addiu $a1, $sp, 0x38 /* 0D0188 800CF588 AFA20480 */ sw $v0, 0x480($sp) /* 0D018C 800CF58C 8FB80480 */ lw $t8, 0x480($sp) @@ -103,7 +103,7 @@ glabel func_800CF530 /* 0D02A8 800CF6A8 8FA40488 */ lw $a0, 0x488($sp) /* 0D02AC 800CF6AC 27A60038 */ addiu $a2, $sp, 0x38 /* 0D02B0 800CF6B0 A7B80004 */ sh $t8, 4($sp) -/* 0D02B4 800CF6B4 0C033F6A */ jal func_800CFDA8 +/* 0D02B4 800CF6B4 0C033F6A */ jal corrupted /* 0D02B8 800CF6B8 8FA50004 */ lw $a1, 4($sp) /* 0D02BC 800CF6BC 8FB90028 */ lw $t9, 0x28($sp) /* 0D02C0 800CF6C0 00594823 */ subu $t1, $v0, $t9 diff --git a/lib/asm/non_matchings/unknown_0D0130/func_800D0390.s b/lib/asm/non_matchings/unknown_0D0130/osPfsNumFiles.s similarity index 99% rename from lib/asm/non_matchings/unknown_0D0130/func_800D0390.s rename to lib/asm/non_matchings/unknown_0D0130/osPfsNumFiles.s index 5c58761a..6fecb5b7 100644 --- a/lib/asm/non_matchings/unknown_0D0130/func_800D0390.s +++ b/lib/asm/non_matchings/unknown_0D0130/osPfsNumFiles.s @@ -1,4 +1,4 @@ -glabel func_800D0390 +glabel osPfsNumFiles /* 0D0F90 800D0390 27BDFFB8 */ addiu $sp, $sp, -0x48 /* 0D0F94 800D0394 AFA40048 */ sw $a0, 0x48($sp) /* 0D0F98 800D0398 8FAE0048 */ lw $t6, 0x48($sp) diff --git a/lib/asm/non_matchings/unknown_0D0130/func_800CFF90.s b/lib/asm/non_matchings/unknown_0D0130/osPfsReFormat.s similarity index 99% rename from lib/asm/non_matchings/unknown_0D0130/func_800CFF90.s rename to lib/asm/non_matchings/unknown_0D0130/osPfsReFormat.s index 3439bafb..e82c3b0d 100644 --- a/lib/asm/non_matchings/unknown_0D0130/func_800CFF90.s +++ b/lib/asm/non_matchings/unknown_0D0130/osPfsReFormat.s @@ -1,4 +1,4 @@ -glabel func_800CFF90 +glabel osPfsReFormat /* 0D0B90 800CFF90 27BDFEB0 */ addiu $sp, $sp, -0x150 /* 0D0B94 800CFF94 AFBF001C */ sw $ra, 0x1c($sp) /* 0D0B98 800CFF98 AFA40150 */ sw $a0, 0x150($sp) diff --git a/lib/asm/non_matchings/unknown_0D1180/func_800D0D88.s b/lib/asm/non_matchings/unknown_0D1180/__osBlockSum.s similarity index 99% rename from lib/asm/non_matchings/unknown_0D1180/func_800D0D88.s rename to lib/asm/non_matchings/unknown_0D1180/__osBlockSum.s index f0e3ba23..8de87cc4 100644 --- a/lib/asm/non_matchings/unknown_0D1180/func_800D0D88.s +++ b/lib/asm/non_matchings/unknown_0D1180/__osBlockSum.s @@ -1,4 +1,4 @@ -glabel func_800D0D88 +glabel __osBlockSum /* 0D1988 800D0D88 27BDFFC0 */ addiu $sp, $sp, -0x40 /* 0D198C 800D0D8C AFA40040 */ sw $a0, 0x40($sp) /* 0D1990 800D0D90 AFA7004C */ sw $a3, 0x4c($sp) diff --git a/lib/asm/non_matchings/unknown_0D1180/func_800D0B50.s b/lib/asm/non_matchings/unknown_0D1180/__osPfsReleasePages.s similarity index 98% rename from lib/asm/non_matchings/unknown_0D1180/func_800D0B50.s rename to lib/asm/non_matchings/unknown_0D1180/__osPfsReleasePages.s index 0104fa68..3dd1ffbc 100644 --- a/lib/asm/non_matchings/unknown_0D1180/func_800D0B50.s +++ b/lib/asm/non_matchings/unknown_0D1180/__osPfsReleasePages.s @@ -1,4 +1,4 @@ -glabel func_800D0B50 +glabel __osPfsReleasePages /* 0D1750 800D0B50 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 0D1754 800D0B54 AFA60030 */ sw $a2, 0x30($sp) /* 0D1758 800D0B58 93B80033 */ lbu $t8, 0x33($sp) @@ -70,7 +70,7 @@ glabel func_800D0B50 /* 0D1848 800D0C48 8FA40028 */ lw $a0, 0x28($sp) /* 0D184C 800D0C4C 93A50033 */ lbu $a1, 0x33($sp) /* 0D1850 800D0C50 8FA60034 */ lw $a2, 0x34($sp) -/* 0D1854 800D0C54 0C034362 */ jal func_800D0D88 +/* 0D1854 800D0C54 0C034362 */ jal __osBlockSum /* 0D1858 800D0C58 93A7003B */ lbu $a3, 0x3b($sp) /* 0D185C 800D0C5C AFA2001C */ sw $v0, 0x1c($sp) /* 0D1860 800D0C60 8FB9001C */ lw $t9, 0x1c($sp) @@ -111,7 +111,7 @@ glabel func_800D0B50 /* 0D18E0 800D0CE0 93A7003B */ lbu $a3, 0x3b($sp) /* 0D18E4 800D0CE4 8FA60034 */ lw $a2, 0x34($sp) /* 0D18E8 800D0CE8 93A50021 */ lbu $a1, 0x21($sp) -/* 0D18EC 800D0CEC 0C034362 */ jal func_800D0D88 +/* 0D18EC 800D0CEC 0C034362 */ jal __osBlockSum /* 0D18F0 800D0CF0 8FA40028 */ lw $a0, 0x28($sp) /* 0D18F4 800D0CF4 AFA2001C */ sw $v0, 0x1c($sp) /* 0D18F8 800D0CF8 8FAD001C */ lw $t5, 0x1c($sp) diff --git a/lib/asm/non_matchings/unknown_0D1180/func_800D0870.s b/lib/asm/non_matchings/unknown_0D1180/osPfsDeleteFile.s similarity index 99% rename from lib/asm/non_matchings/unknown_0D1180/func_800D0870.s rename to lib/asm/non_matchings/unknown_0D1180/osPfsDeleteFile.s index 3feb913e..1358dc2b 100644 --- a/lib/asm/non_matchings/unknown_0D1180/func_800D0870.s +++ b/lib/asm/non_matchings/unknown_0D1180/osPfsDeleteFile.s @@ -1,4 +1,4 @@ -glabel func_800D0870 +glabel osPfsDeleteFile /* 0D1470 800D0870 27BDFEA0 */ addiu $sp, $sp, -0x160 /* 0D1474 800D0874 AFA50164 */ sw $a1, 0x164($sp) /* 0D1478 800D0878 97AE0166 */ lhu $t6, 0x166($sp) @@ -114,7 +114,7 @@ glabel func_800D0870 /* 0D1608 800D0A08 27A50054 */ addiu $a1, $sp, 0x54 /* 0D160C 800D0A0C 93A6002F */ lbu $a2, 0x2f($sp) /* 0D1610 800D0A10 27A70032 */ addiu $a3, $sp, 0x32 -/* 0D1614 800D0A14 0C0342D4 */ jal func_800D0B50 +/* 0D1614 800D0A14 0C0342D4 */ jal __osPfsReleasePages /* 0D1618 800D0A18 AFAF0010 */ sw $t7, 0x10($sp) /* 0D161C 800D0A1C AFA20154 */ sw $v0, 0x154($sp) /* 0D1620 800D0A20 8FA80154 */ lw $t0, 0x154($sp) diff --git a/lib/asm/non_matchings/unknown_0D29F0/func_800D1DF0.s b/lib/asm/non_matchings/unknown_0D29F0/osSpTaskYielded.s similarity index 95% rename from lib/asm/non_matchings/unknown_0D29F0/func_800D1DF0.s rename to lib/asm/non_matchings/unknown_0D29F0/osSpTaskYielded.s index ee61f215..88451a36 100644 --- a/lib/asm/non_matchings/unknown_0D29F0/func_800D1DF0.s +++ b/lib/asm/non_matchings/unknown_0D29F0/osSpTaskYielded.s @@ -1,7 +1,7 @@ -glabel func_800D1DF0 +glabel osSpTaskYielded /* 0D29F0 800D1DF0 27BDFFE0 */ addiu $sp, $sp, -0x20 /* 0D29F4 800D1DF4 AFBF0014 */ sw $ra, 0x14($sp) -/* 0D29F8 800D1DF8 0C0358FC */ jal func_800D63F0 +/* 0D29F8 800D1DF8 0C0358FC */ jal __osSpGetStatus /* 0D29FC 800D1DFC AFA40020 */ sw $a0, 0x20($sp) /* 0D2A00 800D1E00 AFA2001C */ sw $v0, 0x1c($sp) /* 0D2A04 800D1E04 8FAE001C */ lw $t6, 0x1c($sp) diff --git a/lib/asm/non_matchings/unknown_0D3020/func_800D63F0.s b/lib/asm/non_matchings/unknown_0D3020/__osSpGetStatus.s similarity index 88% rename from lib/asm/non_matchings/unknown_0D3020/func_800D63F0.s rename to lib/asm/non_matchings/unknown_0D3020/__osSpGetStatus.s index e49f79b6..68a4645c 100644 --- a/lib/asm/non_matchings/unknown_0D3020/func_800D63F0.s +++ b/lib/asm/non_matchings/unknown_0D3020/__osSpGetStatus.s @@ -1,4 +1,4 @@ -glabel func_800D63F0 +glabel __osSpGetStatus /* 0D6FF0 800D63F0 3C0EA404 */ lui $t6, 0xa404 /* 0D6FF4 800D63F4 03E00008 */ jr $ra /* 0D6FF8 800D63F8 8DC20010 */ lw $v0, 0x10($t6) diff --git a/lib/asm/non_matchings/unknown_0D4270/func_800D3670.s b/lib/asm/non_matchings/unknown_0D4270/__osAiDeviceBusy.s similarity index 96% rename from lib/asm/non_matchings/unknown_0D4270/func_800D3670.s rename to lib/asm/non_matchings/unknown_0D4270/__osAiDeviceBusy.s index 98ddd31d..03bc2dbc 100644 --- a/lib/asm/non_matchings/unknown_0D4270/func_800D3670.s +++ b/lib/asm/non_matchings/unknown_0D4270/__osAiDeviceBusy.s @@ -1,4 +1,4 @@ -glabel func_800D3670 +glabel __osAiDeviceBusy /* 0D4270 800D3670 3C0EA450 */ lui $t6, %hi(D_A450000C) # $t6, 0xa450 /* 0D4274 800D3674 8DC4000C */ lw $a0, %lo(D_A450000C)($t6) /* 0D4278 800D3678 3C018000 */ lui $at, 0x8000 diff --git a/lib/asm/non_matchings/unknown_0D5390/func_800D47F0.s b/lib/asm/non_matchings/unknown_0D5390/__osSetHWIntrRoutine.s similarity index 97% rename from lib/asm/non_matchings/unknown_0D5390/func_800D47F0.s rename to lib/asm/non_matchings/unknown_0D5390/__osSetHWIntrRoutine.s index 84cbd10e..12e90d2f 100644 --- a/lib/asm/non_matchings/unknown_0D5390/func_800D47F0.s +++ b/lib/asm/non_matchings/unknown_0D5390/__osSetHWIntrRoutine.s @@ -1,4 +1,4 @@ -glabel func_800D47F0 +glabel __osSetHWIntrRoutine /* 0D53F0 800D47F0 27BDFFD8 */ addiu $sp, $sp, -0x28 /* 0D53F4 800D47F4 AFBF001C */ sw $ra, 0x1c($sp) /* 0D53F8 800D47F8 AFA40028 */ sw $a0, 0x28($sp) diff --git a/lib/src/unknown_0C86A0.c b/lib/src/unknown_0C86A0.c index a7b76c46..e1b75bf4 100644 --- a/lib/src/unknown_0C86A0.c +++ b/lib/src/unknown_0C86A0.c @@ -19,6 +19,6 @@ s32 alCSeqGetTicks(ALCSeq *seq) return seq->lastTicks; } -GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/func_800C8284.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/func_800C8380.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/alCSeqSecToTicks.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C86A0/alCSeqTicksToSec.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 da476fbf..b4856297 100644 --- a/lib/src/unknown_0C91A0.c +++ b/lib/src/unknown_0C91A0.c @@ -9,7 +9,7 @@ ALGlobals *alGlobals = NULL; GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alCSPPlay.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/alCSPStop.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/func_800C8600.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C91A0/osAiSetFrequency.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/alClose.s") diff --git a/lib/src/unknown_0C9970.c b/lib/src/unknown_0C9970.c index 2e1d5d6e..92294c27 100644 --- a/lib/src/unknown_0C9970.c +++ b/lib/src/unknown_0C9970.c @@ -6,4 +6,4 @@ u8 D_800E3790 = 0; -GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9970/func_800C8D70.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0C9970/osAiSetNextBuffer.s") diff --git a/lib/src/unknown_0CA2F0.c b/lib/src/unknown_0CA2F0.c index 869642ed..e8d66ee3 100644 --- a/lib/src/unknown_0CA2F0.c +++ b/lib/src/unknown_0CA2F0.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA2F0/func_800C96F0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA2F0/alSynStartVoice.s") diff --git a/lib/src/unknown_0CA410.c b/lib/src/unknown_0CA410.c index 6d33a87a..e701caef 100644 --- a/lib/src/unknown_0CA410.c +++ b/lib/src/unknown_0CA410.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA410/func_800C9810.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA410/alSynSetFXMix.s") diff --git a/lib/src/unknown_0CA9A0.c b/lib/src/unknown_0CA9A0.c index 607a5007..9321d016 100644 --- a/lib/src/unknown_0CA9A0.c +++ b/lib/src/unknown_0CA9A0.c @@ -11,7 +11,7 @@ GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CAC5C.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CB2D4.s") 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/func_800CB714.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/alRaw16Pull.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/func_800CBAC0.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/alLoadPull.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CA9A0/alResampleParam.s") diff --git a/lib/src/unknown_0CD820.c b/lib/src/unknown_0CD820.c index 153b65ce..cc6a67ea 100644 --- a/lib/src/unknown_0CD820.c +++ b/lib/src/unknown_0CD820.c @@ -24,9 +24,9 @@ s32 D_8012CDE8[12]; s32 D_8012CE18; s32 D_8012CE1C; -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCC20.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCE18.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCEE8.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CCFE0.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CD0A4.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/osContInit.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/__osContGetInitData.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/__osPackRequestData.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/osContStartReadData.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/osContGetReadData.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0CD820/func_800CD14C.s") diff --git a/lib/src/unknown_0D0130.c b/lib/src/unknown_0D0130.c index 714571ac..f7d628c8 100644 --- a/lib/src/unknown_0D0130.c +++ b/lib/src/unknown_0D0130.c @@ -4,8 +4,8 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("lib/asm/non_matchings/unknown_0D0130/func_800CF530.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0D0130/func_800CFBF4.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0D0130/func_800CFDA8.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0D0130/func_800CFF90.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0D0130/func_800D0390.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D0130/osPfsChecker.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D0130/corrupted_init.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D0130/corrupted.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D0130/osPfsReFormat.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D0130/osPfsNumFiles.s") diff --git a/lib/src/unknown_0D1180.c b/lib/src/unknown_0D1180.c index 0593c57f..14356582 100644 --- a/lib/src/unknown_0D1180.c +++ b/lib/src/unknown_0D1180.c @@ -5,6 +5,6 @@ #include "macros.h" GLOBAL_ASM("lib/asm/non_matchings/unknown_0D1180/osPfsFileState.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0D1180/func_800D0870.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0D1180/func_800D0B50.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0D1180/func_800D0D88.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D1180/osPfsDeleteFile.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D1180/__osPfsReleasePages.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D1180/__osBlockSum.s") diff --git a/lib/src/unknown_0D29F0.c b/lib/src/unknown_0D29F0.c index 90f10c22..b1be7246 100644 --- a/lib/src/unknown_0D29F0.c +++ b/lib/src/unknown_0D29F0.c @@ -33,7 +33,7 @@ __OSViContext *__osViNext = &vi[1]; #define VI_NTSC_CLOCK 48681812 s32 osViClock = VI_NTSC_CLOCK; -GLOBAL_ASM("lib/asm/non_matchings/unknown_0D29F0/func_800D1DF0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D29F0/osSpTaskYielded.s") void *osViGetCurrentFramebuffer(void){ register u32 saveMask; diff --git a/lib/src/unknown_0D4270.c b/lib/src/unknown_0D4270.c index ffeafe8a..ae655ab2 100644 --- a/lib/src/unknown_0D4270.c +++ b/lib/src/unknown_0D4270.c @@ -4,4 +4,4 @@ #include "types.h" #include "macros.h" -GLOBAL_ASM("lib/asm/non_matchings/unknown_0D4270/func_800D3670.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D4270/__osAiDeviceBusy.s") diff --git a/lib/src/unknown_0D5390.c b/lib/src/unknown_0D5390.c index 3ec756cd..c74313d4 100644 --- a/lib/src/unknown_0D5390.c +++ b/lib/src/unknown_0D5390.c @@ -5,4 +5,4 @@ #include "macros.h" GLOBAL_ASM("lib/asm/non_matchings/unknown_0D5390/osPiRawWriteIo.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0D5390/func_800D47F0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D5390/__osSetHWIntrRoutine.s") diff --git a/lib/src/unknown_0D6C90.c b/lib/src/unknown_0D6C90.c index fc00a63e..79552979 100644 --- a/lib/src/unknown_0D6C90.c +++ b/lib/src/unknown_0D6C90.c @@ -19,7 +19,7 @@ extern OSThread *__osRunningThread = NULL; extern OSThread *D_800E4894 = NULL; // __osFaultedThread GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/__osViSwapContext.s") -GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/func_800D63F0.s") +GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/__osSpGetStatus.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/__osSpSetPc.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/__osSpRawStartDma.s") GLOBAL_ASM("lib/asm/non_matchings/unknown_0D3020/__osSpDeviceBusy.s") diff --git a/src/camera.c b/src/camera.c index 3f735388..50b37641 100644 --- a/src/camera.c +++ b/src/camera.c @@ -175,7 +175,7 @@ unk80120AC0 *func_80069D20(void); void func_800014BC(f32 arg0); s8* get_misc_asset(s32 arg0); s32 func_8006A624(s8 arg0); -void func_8006F64C(s32*, f32, f32, f32, f32*, f32*, f32*); +void guMtxXFMF(s32*, f32, f32, f32, f32*, f32*, f32*); void guPerspectiveF(s32*, s32*, f32, f32, f32, f32, f32); void func_8006F870(s32*, s32*); s16 func_80029F18(f32, f32, f32); @@ -778,7 +778,7 @@ f32 func_80069DC8(f32 arg0, f32 arg1, f32 arg2) { f32 sp34; f32 sp30; f32 returnVal; - func_8006F64C(&D_80120F60, arg0, arg1, arg2, &sp34, &sp30, &returnVal); + guMtxXFMF(&D_80120F60, arg0, arg1, arg2, &sp34, &sp30, &returnVal); return returnVal; } @@ -812,8 +812,8 @@ s32 func_8006A10C(void) { u8 sp23; osCreateMesgQueue(&D_801210E0, &D_801210F8, 1); osSetEventMesg(5, &D_801210E0, D_801210FC); - func_800CCC20(&D_801210E0, &sp23, &D_80121100); - func_800CCFE0(&D_801210E0); + osContInit(&D_801210E0, &sp23, &D_80121100); + osContStartReadData(&D_801210E0); func_8006A434(); D_800DD300 = 0; if ((sp23 & 1) && !(D_80121100[3] & 8)) { diff --git a/src/controller_pak.c b/src/controller_pak.c index 5f7ae848..3280426a 100644 --- a/src/controller_pak.c +++ b/src/controller_pak.c @@ -274,7 +274,7 @@ GLOBAL_ASM("asm/non_matchings/controller_pak/func_800756D4.s") GLOBAL_ASM("asm/non_matchings/controller_pak/func_800758DC.s") s32 func_80075AEC(s32 controllerIndex) { - func_800CCFE0(D_80124010); + osContStartReadData(D_80124010); return 0; } @@ -284,7 +284,7 @@ s32 func_80075D38(s32 controllerIndex) { s32 phi_v1; s32 temp_v0 = func_800758DC(); if (temp_v0 == 0 || temp_v0 == 2) { - temp_v0 = func_800CF530(&pfs[controllerIndex]); + temp_v0 = osPfsChecker(&pfs[controllerIndex]); if (temp_v0 == 0) { phi_v1 = 0; } else if (temp_v0 == 2) { @@ -303,7 +303,7 @@ s32 func_80075DC4(s32 controllerIndex) { s32 phi_v1; s32 temp_v0 = func_800758DC(); if (temp_v0 == 0 || temp_v0 == 2 || temp_v0 == 3) { - temp_v0 = func_800CFF90(&pfs[controllerIndex], D_80124010, controllerIndex); + temp_v0 = osPfsReFormat(&pfs[controllerIndex], D_80124010, controllerIndex); if (temp_v0 == 0) { phi_v1 = 0; } else if (temp_v0 == 2) { @@ -344,7 +344,7 @@ s32 func_80076194(s32 controllerIndex, s32 *arg1, s32 *arg2) { *arg1 = sp28; } if (arg2 != NULL) { - phi_v1 = func_800D0390(&pfs[controllerIndex], &sp24, &sp20); + phi_v1 = osPfsNumFiles(&pfs[controllerIndex], &sp24, &sp20); if (phi_v1 != 0) { func_80075AEC(controllerIndex); return (controllerIndex << 0x1E) | 9; @@ -382,7 +382,7 @@ s32 func_800762C8(s32 controllerIndex, s32 arg1) { temp_a0 = &pfs[controllerIndex]; temp_v0 |= 9; if (osPfsFileState(temp_a0, arg1, &sp30) == 0) { - if (func_800D0870(temp_a0, sp38, sp34, &sp3E, &sp3A) == 0) { + if (osPfsDeleteFile(temp_a0, sp38, sp34, &sp3E, &sp3A) == 0) { temp_v0 = 0; } } diff --git a/src/menu.c b/src/menu.c index 136a9762..94bd7e93 100644 --- a/src/menu.c +++ b/src/menu.c @@ -3556,15 +3556,15 @@ GLOBAL_ASM("asm/non_matchings/menu/func_80093A40.s") GLOBAL_ASM("asm/non_matchings/menu/func_80093D40.s") GLOBAL_ASM("asm/non_matchings/menu/func_80094170.s") -void func_800945B0(void) { +void n_alSynRemovePlayer(void) { func_80072298(1); func_800C5620(7); func_800C5494(7); D_800E0984 = 0; } -void func_800945E4(void) { - func_800945B0(); +void n_alSeqpDelete(void) { + n_alSynRemovePlayer(); } void func_80094604(void) { diff --git a/src/unknown_003260.c b/src/unknown_003260.c index 23c54886..dd932640 100644 --- a/src/unknown_003260.c +++ b/src/unknown_003260.c @@ -106,7 +106,7 @@ void audioNewThread(ALSynConfig* c, OSPri p, s32 arg2){ D_80115F90 = arg2; D_80115F94 = c->heap; c->dmaproc = &func_80003008; - c->outputRate = func_800C8600(22050); + c->outputRate = osAiSetFrequency(22050); D_8011962C = (((f32) c->outputRate)*2.0f)/gVideoRefreshRate; if(D_8011962C < 0){ } diff --git a/src/unknown_0255E0.c b/src/unknown_0255E0.c index 483a8e64..29ca3280 100644 --- a/src/unknown_0255E0.c +++ b/src/unknown_0255E0.c @@ -202,7 +202,7 @@ s32 D_8011D4BC; /******************************/ -extern void func_8006F64C(void*, f32, f32, f32, f32*, f32*, f32*); +extern void guMtxXFMF(void*, f32, f32, f32, f32*, f32*, f32*); @@ -592,7 +592,7 @@ void func_80031018(void){ sp_38.unk08 = 1.0f; func_8006FC30(&sp_50, &sp_38); - func_8006F64C(&sp_50, sp_34, sp_30, sp_2C, &sp_34, &sp_30, &sp_2C); + guMtxXFMF(&sp_50, sp_34, sp_30, sp_2C, &sp_34, &sp_30, &sp_2C); D_8011D468.unk00 = sp_34; D_8011D468.unk04 = sp_30; D_8011D468.unk08 = sp_2C; diff --git a/src/unknown_043920.c b/src/unknown_043920.c index 54a19d15..b5c8e4b9 100644 --- a/src/unknown_043920.c +++ b/src/unknown_043920.c @@ -377,7 +377,7 @@ typedef struct unk800535C4_3 { u8 unk0[0x40]; } unk800535C4_3; -void func_8006F64C(unk800535C4_3*, f32, f32, f32, s32*, s32*, s32*); +void guMtxXFMF(unk800535C4_3*, f32, f32, f32, s32*, s32*, s32*); void func_800535C4(unk800535C4 *arg0, unk800535C4_2 *arg1) { unk800535C4_3 sp30; @@ -391,7 +391,7 @@ void func_800535C4(unk800535C4 *arg0, unk800535C4_2 *arg1) { D_8011D510.unk8 = 1; func_8006FE74(&sp30, &D_8011D510); - func_8006F64C(&sp30, 0, -1, 0, &arg1->unkA0, &arg1->unkA4, &arg1->unk9C); + guMtxXFMF(&sp30, 0, -1, 0, &arg1->unkA0, &arg1->unkA4, &arg1->unk9C); } void func_80053664(Object_64 *arg0) { diff --git a/src/unknown_06B2B0.c b/src/unknown_06B2B0.c index 9d99bd1c..0ca0c8ae 100644 --- a/src/unknown_06B2B0.c +++ b/src/unknown_06B2B0.c @@ -187,7 +187,7 @@ void func_8006F43C(void); void func_800014BC(f32 arg0); s8 *get_misc_asset(s32 arg0); s32 func_8006A624(s8 arg0); -void func_8006F64C(s32*, f32, f32, f32, f32*, f32*, f32*); +void guMtxXFMF(s32*, f32, f32, f32, f32*, f32*, f32*); void guPerspectiveF(s32*, s32*, f32, f32, f32, f32, f32); void func_8006F870(s32*, s32*); s16 func_80029F18(f32, f32, f32); @@ -953,7 +953,7 @@ GLOBAL_ASM("asm/non_matchings/unknown_06B2B0/func_8006CCF0.s") void func_8006D8A4(void) { D_800DD390 = 0x2C; gIsPaused = 0; - func_800945E4(); + n_alSeqpDelete(); func_800C01D8(&D_800DD408); } diff --git a/src/unknown_079F50.c b/src/unknown_079F50.c index 6b95feee..12ca8e90 100644 --- a/src/unknown_079F50.c +++ b/src/unknown_079F50.c @@ -247,7 +247,7 @@ void func_80079B44(OSSched *sc){ } } if(t->state & 0x10){ - if(func_800D1DF0(&(t->list))){ + if(osSpTaskYielded(&(t->list))){ t->state |= 0x20; if ((t->flags & 0x07) == -3) {