falso
/
mk64
mirror of https://github.com/n64decomp/mk64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

audio/external: match 800C5CB8, 800C3448, 800CB2C4, 800C35E8 (#359) 

* Match funcs in audio/external.c
This commit is contained in:
Joshua Peisach 2023-08-09 20:36:24 -04:00 committed by GitHub
parent 870c39ad77
commit 727ceadfb4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 22 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
asm/non_matchings/audio/external/func_800C3448.s vendored
View File

@ -1,13 +0,0 @@
glabel func_800C3448
/* 0C4048 800C3448 3C03800F */ lui $v1, %hi(D_800EA1E4) # $v1, 0x800f
/* 0C404C 800C344C 2463A1E4 */ addiu $v1, %lo(D_800EA1E4) # addiu $v1, $v1, -0x5e1c
/* 0C4050 800C3450 90620000 */ lbu $v0, ($v1)
/* 0C4054 800C3454 3C018019 */ lui $at, %hi(D_80192CD0)
/* 0C4058 800C3458 27BDFFF0 */ addiu $sp, $sp, -0x10
/* 0C405C 800C345C 00027080 */ sll $t6, $v0, 2
/* 0C4060 800C3460 002E0821 */ addu $at, $at, $t6
/* 0C4064 800C3464 AC242CD0 */ sw $a0, %lo(D_80192CD0)($at)
/* 0C4068 800C3468 244F0001 */ addiu $t7, $v0, 1
/* 0C406C 800C346C A06F0000 */ sb $t7, ($v1)
/* 0C4070 800C3470 03E00008 */ jr $ra
/* 0C4074 800C3474 27BD0010 */ addiu $sp, $sp, 0x10

9
asm/non_matchings/audio/external/func_800C35E8.s vendored
View File

@ -1,9 +0,0 @@
glabel func_800C35E8
/* 0C41E8 800C35E8 27BDFFF0 */ addiu $sp, $sp, -0x10
/* 0C41EC 800C35EC 308E00FF */ andi $t6, $a0, 0xff
/* 0C41F0 800C35F0 3C018019 */ lui $at, %hi(D_80192CC6)
/* 0C41F4 800C35F4 AFA40010 */ sw $a0, 0x10($sp)
/* 0C41F8 800C35F8 002E0821 */ addu $at, $at, $t6
/* 0C41FC 800C35FC A0202CC6 */ sb $zero, %lo(D_80192CC6)($at)
/* 0C4200 800C3600 03E00008 */ jr $ra
/* 0C4204 800C3604 27BD0010 */ addiu $sp, $sp, 0x10

20
asm/non_matchings/audio/external/func_800C5CB8.s vendored
View File

@ -1,20 +0,0 @@
glabel func_800C5CB8
/* 0C68B8 800C5CB8 27BDFFD0 */ addiu $sp, $sp, -0x30
/* 0C68BC 800C5CBC AFBF002C */ sw $ra, 0x2c($sp)
/* 0C68C0 800C5CC0 AFBE0028 */ sw $fp, 0x28($sp)
/* 0C68C4 800C5CC4 0C03091D */ jal func_800C2474
/* 0C68C8 800C5CC8 03A0F025 */ move $fp, $sp
/* 0C68CC 800C5CCC 0C030FDC */ jal func_800C3F70
/* 0C68D0 800C5CD0 00000000 */ nop
/* 0C68D4 800C5CD4 0C03168F */ jal func_800C5A3C
/* 0C68D8 800C5CD8 00000000 */ nop
/* 0C68DC 800C5CDC 24040002 */ li $a0, 2
/* 0C68E0 800C5CE0 00002825 */ move $a1, $zero
/* 0C68E4 800C5CE4 240600FF */ li $a2, 255
/* 0C68E8 800C5CE8 0C030A13 */ jal func_800C284C
/* 0C68EC 800C5CEC 24070001 */ li $a3, 1
/* 0C68F0 800C5CF0 8FDF002C */ lw $ra, 0x2c($fp)
/* 0C68F4 800C5CF4 03C0E825 */ move $sp, $fp
/* 0C68F8 800C5CF8 8FDE0028 */ lw $fp, 0x28($fp)
/* 0C68FC 800C5CFC 03E00008 */ jr $ra
/* 0C6900 800C5D00 27BD0030 */ addiu $sp, $sp, 0x30

28
asm/non_matchings/audio/external/func_800CB2C4.s vendored
View File

@ -1,28 +0,0 @@
glabel func_800CB2C4
/* 0CBEC4 800CB2C4 27BDFFD8 */ addiu $sp, $sp, -0x28
/* 0CBEC8 800CB2C8 AFBF0024 */ sw $ra, 0x24($sp)
/* 0CBECC 800CB2CC AFBE0020 */ sw $fp, 0x20($sp)
/* 0CBED0 800CB2D0 0C0307E3 */ jal func_800C1F8C
/* 0CBED4 800CB2D4 03A0F025 */ move $fp, $sp
/* 0CBED8 800CB2D8 0C030DC9 */ jal func_800C3724
/* 0CBEDC 800CB2DC 00000000 */ nop
/* 0CBEE0 800CB2E0 0C030D1E */ jal func_800C3478
/* 0CBEE4 800CB2E4 00000000 */ nop
/* 0CBEE8 800CB2E8 0C031612 */ jal func_800C5848
/* 0CBEEC 800CB2EC 00000000 */ nop
/* 0CBEF0 800CB2F0 0C031671 */ jal func_800C59C4
/* 0CBEF4 800CB2F4 00000000 */ nop
/* 0CBEF8 800CB2F8 0C032333 */ jal func_800C8CCC
/* 0CBEFC 800CB2FC 00000000 */ nop
/* 0CBF00 800CB300 0C03089D */ jal func_800C2274
/* 0CBF04 800CB304 00002025 */ move $a0, $zero
/* 0CBF08 800CB308 0C032F09 */ jal func_800CBC24
/* 0CBF0C 800CB30C 00000000 */ nop
/* 0CBF10 800CB310 8FDF0024 */ lw $ra, 0x24($fp)
/* 0CBF14 800CB314 03C0E825 */ move $sp, $fp
/* 0CBF18 800CB318 8FDE0020 */ lw $fp, 0x20($fp)
/* 0CBF1C 800CB31C 03E00008 */ jr $ra
/* 0CBF20 800CB320 27BD0028 */ addiu $sp, $sp, 0x28
/* 0CBF24 800CB324 00000000 */ nop
/* 0CBF28 800CB328 00000000 */ nop

63
src/audio/external.c
View File

@ -1087,21 +1087,13 @@ block_11:
GLOBAL_ASM("asm/non_matchings/audio/external/func_800C2A2C.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern u8 D_800EA1E4;
extern ? D_80192CD0;
extern u32 D_80192CD0[];
void func_800C3448(s32 arg0) {
u8 temp_v0;
temp_v0 = D_800EA1E4;
*(&D_80192CD0 + (temp_v0 * 4)) = arg0;
D_800EA1E4 = temp_v0 + 1;
D_80192CD0[D_800EA1E4] = arg0;
D_800EA1E4 += 1;
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800C3448.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@ -1179,16 +1171,12 @@ s32 func_800C357C(s32 arg0) {
GLOBAL_ASM("asm/non_matchings/audio/external/func_800C357C.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_80192CC6;
extern unsigned char D_80192CC6[];
void func_800C35E8(s32 arg0) {
*(&D_80192CC6 + (arg0 & 0xFF)) = 0;
void func_800C35E8(u8 arg0) {
D_80192CC6[arg0] = 0;
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800C35E8.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@ -2713,23 +2701,18 @@ void func_800C5C40(void) {
GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5C40.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_800C2474(); // extern
void func_800C284C(u8, u8, u8, s32); // extern
void func_800C3F70(); // extern
void func_800C5A3C(); // extern
extern void func_800C2474();
extern void func_800C284C(u8, u8, u8, s32);
extern void func_800C3F70();
extern void func_800C5A3C();
// game_audio_init?
void func_800C5CB8(void) {
func_800C2474();
func_800C3F70();
func_800C5A3C();
func_800C284C(2, 0, 255, 1);
func_800C284C(2, 0, 0xFF, 1);
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5CB8.s")
#endif
#ifdef MIPS_TO_C
//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c
@ -5408,19 +5391,15 @@ void func_800CB14C(void) {
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CB14C.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
//void func_800C1F8C(); // extern
//void func_800C2274(?); // extern
//void func_800C3478(); // extern
//void func_800C3724(); // extern
//void func_800C5848(); // extern
//void func_800C59C4(); // extern
//void func_800C8CCC(); // extern
//void func_800CBC24(); // extern
extern void func_800C2274(s32); /* extern */
extern void func_800C3478(); /* extern */
extern void func_800C3724(); /* extern */
extern void func_800C59C4(); /* extern */
extern void func_800C8CCC(); /* extern */
extern void func_800CBC24(); /* extern */
// run audio?
void func_800CB2C4(void) {
void func_800CB2C4() {
func_800C1F8C();
func_800C3724();
func_800C3478();
@ -5430,6 +5409,4 @@ void func_800CB2C4(void) {
func_800C2274(0);
func_800CBC24();
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CB2C4.s")
#endif

4
src/audio/external.h
View File

@ -88,7 +88,7 @@ struct Unk_800EA06C {
/* 0x0D */ // u8 compilerPadding0[3];
};
void func_800C35E8(s32);
void func_800C35E8(u8);
u16 func_800C3508(s32);
void func_800C5278(u8);
void func_800CB14C(void);
@ -148,7 +148,7 @@ void func_800CA49C(u8);
void func_800CAACC(u8);
void func_800CAEC4(u8, f32);
void func_800CB134();
void func_800CB2C4(void);
void func_800CB2C4();
void func_800C5CB8(void);
// Based on SM64, this should be part of data.c's BSS section. Somehow.