From a2dec1836e94fa933a16a5c7886ac2090edf752e Mon Sep 17 00:00:00 2001 From: Rena Kunisaki Date: Thu, 2 Feb 2023 16:56:43 -0500 Subject: [PATCH] maybe fix it now!? --- asm/non_matchings/unknown_005740/func_80006FC8.s | 6 +++--- asm/non_matchings/unknown_005740/func_80008438.s | 6 +++--- src/unknown_003260.c | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/asm/non_matchings/unknown_005740/func_80006FC8.s b/asm/non_matchings/unknown_005740/func_80006FC8.s index e9f43933..487c605d 100644 --- a/asm/non_matchings/unknown_005740/func_80006FC8.s +++ b/asm/non_matchings/unknown_005740/func_80006FC8.s @@ -322,7 +322,7 @@ glabel func_80006FC8 /* 008030 80007430 8E890000 */ lw $t1, ($s4) /* 008034 80007434 24050050 */ li $a1, 80 /* 008038 80007438 8D240050 */ lw $a0, 0x50($t1) -/* 00803C 8000743C 0C001181 */ jal amSndSetVolXYZ +/* 00803C 8000743C 0C001181 */ jal func_80004604 /* 008040 80007440 00000000 */ nop /* 008044 80007444 8E900000 */ lw $s0, ($s4) /* 008048 80007448 24050004 */ li $a1, 4 @@ -494,7 +494,7 @@ glabel func_80006FC8 /* 0082B0 800076B0 24050050 */ li $a1, 80 /* 0082B4 800076B4 01114821 */ addu $t1, $t0, $s1 /* 0082B8 800076B8 8D240048 */ lw $a0, 0x48($t1) -/* 0082BC 800076BC 0C001181 */ jal amSndSetVolXYZ +/* 0082BC 800076BC 0C001181 */ jal func_80004604 /* 0082C0 800076C0 00000000 */ nop /* 0082C4 800076C4 8FAA007C */ lw $t2, 0x7c($sp) /* 0082C8 800076C8 24010001 */ li $at, 1 @@ -1074,7 +1074,7 @@ glabel func_80006FC8 /* 008AF8 80007EF8 0C00127E */ jal func_800049F8 /* 008AFC 80007EFC 24050004 */ li $a1, 4 /* 008B00 80007F00 8E240048 */ lw $a0, 0x48($s1) -/* 008B04 80007F04 0C001181 */ jal amSndSetVolXYZ +/* 008B04 80007F04 0C001181 */ jal func_80004604 /* 008B08 80007F08 24050046 */ li $a1, 70 .L80007F0C: /* 008B0C 80007F0C 26730004 */ addiu $s3, $s3, 4 diff --git a/asm/non_matchings/unknown_005740/func_80008438.s b/asm/non_matchings/unknown_005740/func_80008438.s index 9a7351d6..78fa05df 100644 --- a/asm/non_matchings/unknown_005740/func_80008438.s +++ b/asm/non_matchings/unknown_005740/func_80008438.s @@ -157,7 +157,7 @@ glabel func_80008438 /* 00927C 8000867C 00000000 */ nop /* 009280 80008680 8E240018 */ lw $a0, 0x18($s1) /* 009284 80008684 92250021 */ lbu $a1, 0x21($s1) -/* 009288 80008688 0C001181 */ jal amSndSetVolXYZ +/* 009288 80008688 0C001181 */ jal func_80004604 /* 00928C 8000868C 00000000 */ nop .L80008690: /* 009290 80008690 10000109 */ b .L80008AB8 @@ -403,7 +403,7 @@ glabel func_80008438 /* 00960C 80008A0C 24050004 */ li $a1, 4 /* 009610 80008A10 8E240018 */ lw $a0, 0x18($s1) /* 009614 80008A14 92250021 */ lbu $a1, 0x21($s1) -/* 009618 80008A18 0C001181 */ jal amSndSetVolXYZ +/* 009618 80008A18 0C001181 */ jal func_80004604 /* 00961C 80008A1C 00000000 */ nop /* 009620 80008A20 8E240018 */ lw $a0, 0x18($s1) /* 009624 80008A24 8E250000 */ lw $a1, ($s1) @@ -763,7 +763,7 @@ glabel func_80008438 /* 009B44 80008F44 00000000 */ nop /* 009B48 80008F48 8DA40178 */ lw $a0, 0x178($t5) /* 009B4C 80008F4C 91A5017E */ lbu $a1, 0x17e($t5) -/* 009B50 80008F50 0C001181 */ jal amSndSetVolXYZ +/* 009B50 80008F50 0C001181 */ jal func_80004604 /* 009B54 80008F54 00000000 */ nop /* 009B58 80008F58 1000001B */ b .L80008FC8 /* 009B5C 80008F5C 8FAB0260 */ lw $t3, 0x260($sp) diff --git a/src/unknown_003260.c b/src/unknown_003260.c index 813dc633..2bb4a119 100644 --- a/src/unknown_003260.c +++ b/src/unknown_003260.c @@ -396,7 +396,6 @@ GLOBAL_ASM("asm/non_matchings/unknown_003260/func_800042CC.s") GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80004384.s") GLOBAL_ASM("asm/non_matchings/unknown_003260/func_80004520.s") -//possibly amSndSetVolXYZ void func_80004604(u8 *arg0, u8 arg1) { if (arg0) arg0[0x36] = arg1;