This commit is contained in:
Donkey Kong 2024-09-24 11:14:35 -05:00
parent 029fff4446
commit c5be0e0d2c
9 changed files with 50 additions and 24 deletions

View File

@ -1,5 +1,6 @@
#ifndef __STRUCTS_H__ #ifndef __STRUCTS_H__
#define __STRUCTS_H__ #define __STRUCTS_H__
#include "synthinternal.h"
/* your struct definitions go here */ /* your struct definitions go here */
@ -2101,6 +2102,29 @@ typedef struct Struct8073F1E4_container {
Struct8073F1E4* unk8; Struct8073F1E4* unk8;
} Struct8073F1E4_container; } Struct8073F1E4_container;
typedef Acmd *(*CommandHandler)(s32, Acmd *, s32);
typedef struct N_ALMAinBus_s {
ALFilter *source;
CommandHandler handler;
} N_ALMAinBus;
typedef struct CustomPVoice {
ALLink node;
u8 pad8[0x2C - 0x8];
ALResampler resampler;
u8 pad60[0x8C - 0x60];
u8 unk8C;
u8 pad8D[0x90 - 0x8D];
s16 unk90;
s16 unk92;
u8 pad94[0x98 - 0x94];
s32 unk98;
u8 pad9C[0xB8 - 0x9C];
s32 unkB8;
s32 unkBC;
} CustomPVoice;
typedef struct { typedef struct {
u8 pad0[0x2 - 0x0]; u8 pad0[0x2 - 0x0];
s16 unk2; s16 unk2;

View File

@ -128,7 +128,7 @@ us,asm,func_global_asm_80732894,152,yes
us,asm,func_global_asm_8070CD14,48,yes us,asm,func_global_asm_8070CD14,48,yes
us,asm,func_global_asm_80672A70,140,yes us,asm,func_global_asm_80672A70,140,yes
us,asm,func_global_asm_80684850,176,yes us,asm,func_global_asm_80684850,176,yes
us,asm,func_global_asm_8073C820,176,no us,asm,func_global_asm_8073C820,176,yes
us,asm,func_global_asm_80732444,132,yes us,asm,func_global_asm_80732444,132,yes
us,asm,func_global_asm_80647CF4,136,yes us,asm,func_global_asm_80647CF4,136,yes
us,asm,func_global_asm_806D25CC,160,yes us,asm,func_global_asm_806D25CC,160,yes
@ -2572,7 +2572,7 @@ us,asm,func_global_asm_806E341C,188,yes
us,asm,func_global_asm_80722280,20,yes us,asm,func_global_asm_80722280,20,yes
us,asm,func_global_asm_80680774,248,yes us,asm,func_global_asm_80680774,248,yes
us,asm,func_global_asm_80677D80,328,no us,asm,func_global_asm_80677D80,328,no
us,asm,func_global_asm_8073928C,148,no us,asm,func_global_asm_8073928C,148,yes
us,asm,func_global_asm_806B2D5C,8,yes us,asm,func_global_asm_806B2D5C,8,yes
us,asm,func_global_asm_806D5300,1264,yes us,asm,func_global_asm_806D5300,1264,yes
us,asm,func_global_asm_806CC284,224,yes us,asm,func_global_asm_806CC284,224,yes

1 version section function length matching
128 us asm func_global_asm_8070CD14 48 yes
129 us asm func_global_asm_80672A70 140 yes
130 us asm func_global_asm_80684850 176 yes
131 us asm func_global_asm_8073C820 176 no yes
132 us asm func_global_asm_80732444 132 yes
133 us asm func_global_asm_80647CF4 136 yes
134 us asm func_global_asm_806D25CC 160 yes
2572 us asm func_global_asm_80722280 20 yes
2573 us asm func_global_asm_80680774 248 yes
2574 us asm func_global_asm_80677D80 328 no
2575 us asm func_global_asm_8073928C 148 no yes
2576 us asm func_global_asm_806B2D5C 8 yes
2577 us asm func_global_asm_806D5300 1264 yes
2578 us asm func_global_asm_806CC284 224 yes

View File

@ -128,7 +128,7 @@ us,asm,func_global_asm_80732894,152,yes
us,asm,func_global_asm_8070CD14,48,yes us,asm,func_global_asm_8070CD14,48,yes
us,asm,func_global_asm_80672A70,140,yes us,asm,func_global_asm_80672A70,140,yes
us,asm,func_global_asm_80684850,176,yes us,asm,func_global_asm_80684850,176,yes
us,asm,func_global_asm_8073C820,176,no us,asm,func_global_asm_8073C820,176,yes
us,asm,func_global_asm_80732444,132,yes us,asm,func_global_asm_80732444,132,yes
us,asm,func_global_asm_80647CF4,136,yes us,asm,func_global_asm_80647CF4,136,yes
us,asm,func_global_asm_806D25CC,160,yes us,asm,func_global_asm_806D25CC,160,yes
@ -2572,7 +2572,7 @@ us,asm,func_global_asm_806E341C,188,yes
us,asm,func_global_asm_80722280,20,yes us,asm,func_global_asm_80722280,20,yes
us,asm,func_global_asm_80680774,248,yes us,asm,func_global_asm_80680774,248,yes
us,asm,func_global_asm_80677D80,328,no us,asm,func_global_asm_80677D80,328,no
us,asm,func_global_asm_8073928C,148,no us,asm,func_global_asm_8073928C,148,yes
us,asm,func_global_asm_806B2D5C,8,yes us,asm,func_global_asm_806B2D5C,8,yes
us,asm,func_global_asm_806D5300,1264,yes us,asm,func_global_asm_806D5300,1264,yes
us,asm,func_global_asm_806CC284,224,yes us,asm,func_global_asm_806CC284,224,yes

1 version section function length matching
128 us asm func_global_asm_8070CD14 48 yes
129 us asm func_global_asm_80672A70 140 yes
130 us asm func_global_asm_80684850 176 yes
131 us asm func_global_asm_8073C820 176 no yes
132 us asm func_global_asm_80732444 132 yes
133 us asm func_global_asm_80647CF4 136 yes
134 us asm func_global_asm_806D25CC 160 yes
2572 us asm func_global_asm_80722280 20 yes
2573 us asm func_global_asm_80680774 248 yes
2574 us asm func_global_asm_80677D80 328 no
2575 us asm func_global_asm_8073928C 148 no yes
2576 us asm func_global_asm_806B2D5C 8 yes
2577 us asm func_global_asm_806D5300 1264 yes
2578 us asm func_global_asm_806CC284 224 yes

View File

@ -17,7 +17,7 @@
<text x="38.5" y="14">global_asm</text> <text x="38.5" y="14">global_asm</text>
</g> </g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"> <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="111.5" y="15" fill="#010101" fill-opacity=".3">37.6327%</text> <text x="111.5" y="15" fill="#010101" fill-opacity=".3">37.6590%</text>
<text x="110.5" y="14">37.6327%</text> <text x="110.5" y="14">37.6590%</text>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 1.0 KiB

View File

@ -17,7 +17,7 @@
<text x="66.0" y="14">Donkey Kong 64 (US)</text> <text x="66.0" y="14">Donkey Kong 64 (US)</text>
</g> </g>
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"> <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="166.5" y="15" fill="#010101" fill-opacity=".3">39.6419%</text> <text x="166.5" y="15" fill="#010101" fill-opacity=".3">39.6615%</text>
<text x="165.5" y="14">39.6419%</text> <text x="165.5" y="14">39.6615%</text>
</g> </g>
</svg> </svg>

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -1,7 +1,24 @@
#include <ultra64.h> #include <ultra64.h>
#include "functions.h" #include "functions.h"
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141520/func_global_asm_8073C820.s") ALParam *__n_allocParam();
s32 func_global_asm_8073F1E4(Struct8073F1E4 *, s32, ALParam *);
void func_global_asm_8073C820(Struct8073F1E4_container *arg0, u8 arg1) {
ALParam *sp1C;
if (arg0->unk8 != NULL) {
sp1C = __n_allocParam();
if (sp1C == NULL) {
return;
}
sp1C->delta = n_syn->paramSamples + arg0->unk8->unk88;
sp1C->type = 0x10;
sp1C->data.i = arg1;
sp1C->next = 0;
func_global_asm_8073F1E4(arg0->unk8, 3, sp1C);
}
}
#pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141520/func_global_asm_8073C8D0.s") #pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/code_141520/func_global_asm_8073C8D0.s")

View File

@ -5,13 +5,6 @@
extern u8 D_global_asm_807FF0F4[2]; extern u8 D_global_asm_807FF0F4[2];
extern u8 D_global_asm_807FF0F6[2]; extern u8 D_global_asm_807FF0F6[2];
typedef Acmd *(*CommandHandler)(s32, Acmd *, s32);
typedef struct N_ALMAinBus_s {
ALFilter *source;
CommandHandler handler;
} N_ALMAinBus;
Acmd *func_global_asm_8073FD90(s32 arg0, Acmd *arg1) { Acmd *func_global_asm_8073FD90(s32 arg0, Acmd *arg1) {
Acmd *sp4C; Acmd *sp4C;
s32 sp48; s32 sp48;

View File

@ -2,12 +2,6 @@
#include "functions.h" #include "functions.h"
#include "synthinternal.h" #include "synthinternal.h"
typedef struct CustomPVoice {
ALLink node;
u8 pad8[0x2C - 0x8];
ALResampler resampler;
} CustomPVoice;
Acmd *func_global_asm_80740100(CustomPVoice *, s16 *, s32, Acmd *); Acmd *func_global_asm_80740100(CustomPVoice *, s16 *, s32, Acmd *);
extern f64 D_global_asm_80760580; extern f64 D_global_asm_80760580;
extern f32 D_global_asm_80760588; extern f32 D_global_asm_80760588;

View File

@ -272,8 +272,6 @@ u8 func_global_asm_80739098(ALCSeq *seq, s32 track) {
return theByte; return theByte;
} }
// #pragma GLOBAL_ASM("asm/nonmatchings/global_asm/audio/cseq/func_global_asm_8073928C.s")
s32 func_global_asm_8073928C(ALCSeq *seq, s32 track) { s32 func_global_asm_8073928C(ALCSeq *seq, s32 track) {
// __readVarLen // __readVarLen
u32 value; u32 value;