kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

resolve struct name conflict

Browse Source
This commit is contained in:
Banjo Kazooie
2022-07-31 19:44:09 -05:00
parent fae44219d4
commit 6467dd9890
2 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/2.0L/PR/n_libaudio.h
View File

@@ -191,7 +191,7 @@ typedef struct struct_81_s{
f32 unk44; //volume f32 unk44; //volume
ALMicroTime unk48; //time_remaining? ALMicroTime unk48; //time_remaining?
s32 unk4C; s32 unk4C;
} Struct81s; } N_AL_Struct81s;
typedef struct N_ALVoiceState_s { typedef struct N_ALVoiceState_s {
struct N_ALVoiceState_s *next;/* MUST be first */ struct N_ALVoiceState_s *next;/* MUST be first */

70
src/core1/code_3A70.c
View File

@@ -3,8 +3,8 @@
#include "variables.h" #include "variables.h"
#include "n_libaudio.h" #include "n_libaudio.h"
void func_802444C0(Struct81s *arg0); void func_802444C0(N_AL_Struct81s *arg0);
void func_80244050(ALEventQueue *arg0, Struct81s *arg1, u16 arg2); void func_80244050(ALEventQueue *arg0, N_AL_Struct81s *arg1, u16 arg2);
extern Gfx D_80275880[]; extern Gfx D_80275880[];
@@ -168,9 +168,9 @@ void func_802424D4(Gfx **gfx, Mtx **mtx, Vtx **vtx, f32 arg3[3], f32 arg4[3], f3
// BREAK???=== // BREAK???===
extern struct{ extern struct{
Struct81s *unk0; N_AL_Struct81s *unk0;
Struct81s *unk4; N_AL_Struct81s *unk4;
Struct81s *unk8; N_AL_Struct81s *unk8;
}D_802758C0; }D_802758C0;
extern N_ALSndPlayer *D_802758CC; extern N_ALSndPlayer *D_802758CC;
@@ -202,7 +202,7 @@ extern struct {
// D_802758CC->target = NULL; // D_802758CC->target = NULL;
// D_802758CC->frameTime = 33000; // D_802758CC->frameTime = 33000;
// ; // ;
// D_802758CC->sndState = alHeapDBAlloc(NULL, 0, arg0->unkC, 1, arg0->unk0 * sizeof(Struct81s)); // D_802758CC->sndState = alHeapDBAlloc(NULL, 0, arg0->unkC, 1, arg0->unk0 * sizeof(N_AL_Struct81s));
// alEvtqNew(&D_802758CC->evtq, alHeapDBAlloc(NULL, 0, arg0->unkC, 1, arg0->unk4 * 0x1C), arg0->unk4); // alEvtqNew(&D_802758CC->evtq, alHeapDBAlloc(NULL, 0, arg0->unkC, 1, arg0->unk4 * 0x1C), arg0->unk4);
// // var_s0 = 1; // // var_s0 = 1;
// // var_s1 = 0x50; // // var_s1 = 0x50;
@@ -259,7 +259,7 @@ void func_8024324C(N_ALSndPlayer *arg0) {
#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_3A70/func_802432F8.s") #pragma GLOBAL_ASM("asm/nonmatchings/core1/code_3A70/func_802432F8.s")
void func_80243F84(Struct81s *arg0) { void func_80243F84(N_AL_Struct81s *arg0) {
if (arg0->unk3F & 4) { if (arg0->unk3F & 4) {
n_alSynStopVoice(&arg0->voice); n_alSynStopVoice(&arg0->voice);
n_alSynFreeVoice(&arg0->voice); n_alSynFreeVoice(&arg0->voice);
@@ -268,7 +268,7 @@ void func_80243F84(Struct81s *arg0) {
func_80244050(&D_802758CC->evtq, arg0, 0xFFFF); func_80244050(&D_802758CC->evtq, arg0, 0xFFFF);
} }
void func_80243FE4(Struct81s *arg0) { void func_80243FE4(N_AL_Struct81s *arg0) {
ALEvent evt; ALEvent evt;
f32 sp1C; f32 sp1C;
@@ -279,7 +279,7 @@ void func_80243FE4(Struct81s *arg0) {
alEvtqPostEvent(&D_802758CC->evtq, &evt, 33333); alEvtqPostEvent(&D_802758CC->evtq, &evt, 33333);
} }
void func_80244050(ALEventQueue *arg0, Struct81s *arg1, u16 arg2) { void func_80244050(ALEventQueue *arg0, N_AL_Struct81s *arg1, u16 arg2) {
s32 pad[5]; s32 pad[5];
u32 mask; u32 mask;
ALEventListItem *next_event_list; ALEventListItem *next_event_list;
@@ -300,9 +300,9 @@ void func_80244050(ALEventQueue *arg0, Struct81s *arg1, u16 arg2) {
} }
s32 func_80244110(u16 *arg0, u16 *arg1) { s32 func_80244110(u16 *arg0, u16 *arg1) {
Struct81s *var_v0; N_AL_Struct81s *var_v0;
Struct81s *var_v1_2; N_AL_Struct81s *var_v1_2;
Struct81s *var_a2; N_AL_Struct81s *var_a2;
u16 var_a0; u16 var_a0;
u16 var_a3; u16 var_a3;
u16 var_v1; u16 var_v1;
@@ -312,16 +312,16 @@ s32 func_80244110(u16 *arg0, u16 *arg1) {
var_a2 = D_802758C0.unk4; var_a2 = D_802758C0.unk4;
for(var_a3 = 0; var_v0 != NULL; var_a3++){ for(var_a3 = 0; var_v0 != NULL; var_a3++){
var_v0 = (Struct81s *) var_v0->node.next; var_v0 = (N_AL_Struct81s *) var_v0->node.next;
} }
for(var_a0 = 0; var_v1_2 != NULL; var_a0++) { for(var_a0 = 0; var_v1_2 != NULL; var_a0++) {
var_v1_2 = (Struct81s *) var_v1_2->node.next; var_v1_2 = (N_AL_Struct81s *) var_v1_2->node.next;
} }
for(var_v1 = 0; var_a2 != NULL; var_v1++) { for(var_v1 = 0; var_a2 != NULL; var_v1++) {
var_a2 = (Struct81s *) var_a2->node.prev; var_a2 = (N_AL_Struct81s *) var_a2->node.prev;
} }
*arg0 = var_a0; *arg0 = var_a0;
@@ -333,7 +333,7 @@ s32 func_80244110(u16 *arg0, u16 *arg1) {
#ifndef NONMATCHING #ifndef NONMATCHING
#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_3A70/func_80244190.s") #pragma GLOBAL_ASM("asm/nonmatchings/core1/code_3A70/func_80244190.s")
#else #else
void func_80244190(Struct81s *arg0) { void func_80244190(N_AL_Struct81s *arg0) {
ALMicroTime *temp_a1; ALMicroTime *temp_a1;
s32 prev_volume; s32 prev_volume;
s32 temp_t1; s32 temp_t1;
@@ -343,10 +343,10 @@ void func_80244190(Struct81s *arg0) {
u8 temp_t6; u8 temp_t6;
u8 var_a2; u8 var_a2;
ALEnvelope *envelope; ALEnvelope *envelope;
Struct81s *var_v0; N_AL_Struct81s *var_v0;
Struct81s *var_v1; N_AL_Struct81s *var_v1;
for(var_v0 = D_802758C0.unk0; var_v0 != NULL; var_v0 = (Struct81s *)var_v0->node.next){ for(var_v0 = D_802758C0.unk0; var_v0 != NULL; var_v0 = (N_AL_Struct81s *)var_v0->node.next){
var_v1 = var_v0; var_v1 = var_v0;
envelope = var_v0->unk8->envelope; envelope = var_v0->unk8->envelope;
temp_a1 = &envelope->attackTime; temp_a1 = &envelope->attackTime;
@@ -375,10 +375,10 @@ void func_80244190(Struct81s *arg0) {
#ifndef NONMATCHING #ifndef NONMATCHING
#pragma GLOBAL_ASM("asm/nonmatchings/core1/code_3A70/func_8024431C.s") #pragma GLOBAL_ASM("asm/nonmatchings/core1/code_3A70/func_8024431C.s")
#else #else
Struct81s *func_8024431C(ALBank *bank, ALSound *sound) { N_AL_Struct81s *func_8024431C(ALBank *bank, ALSound *sound) {
s32 pad; s32 pad;
ALKeyMap *sp30; ALKeyMap *sp30;
Struct81s *temp_s0; N_AL_Struct81s *temp_s0;
OSIntMask mask; OSIntMask mask;
s32 sp24; s32 sp24;
@@ -386,7 +386,7 @@ Struct81s *func_8024431C(ALBank *bank, ALSound *sound) {
sp30 = sound->keyMap; sp30 = sound->keyMap;
if (temp_s0 != NULL) { if (temp_s0 != NULL) {
mask = osSetIntMask(OS_IM_NONE); mask = osSetIntMask(OS_IM_NONE);
D_802758C0.unk8 = (Struct81s *) temp_s0->unk0.next; D_802758C0.unk8 = (N_AL_Struct81s *) temp_s0->unk0.next;
alUnlink((ALLink *)temp_s0); alUnlink((ALLink *)temp_s0);
if (D_802758C0.unk0 != NULL) { if (D_802758C0.unk0 != NULL) {
temp_s0->unk0.next = D_802758C0.unk0; temp_s0->unk0.next = D_802758C0.unk0;
@@ -427,18 +427,18 @@ Struct81s *func_8024431C(ALBank *bank, ALSound *sound) {
} }
#endif #endif
void func_802444C0(Struct81s *arg0){ void func_802444C0(N_AL_Struct81s *arg0){
Struct81s *var_v0; N_AL_Struct81s *var_v0;
sizeof(ALVoice); sizeof(ALVoice);
var_v0 = D_802758C0.unk0; var_v0 = D_802758C0.unk0;
if(arg0 == D_802758C0.unk0){ if(arg0 == D_802758C0.unk0){
D_802758C0.unk0 = (Struct81s *)arg0->node.next; D_802758C0.unk0 = (N_AL_Struct81s *)arg0->node.next;
} }
if(arg0 == D_802758C0.unk4){ if(arg0 == D_802758C0.unk4){
D_802758C0.unk4 = (Struct81s *)arg0->node.prev; D_802758C0.unk4 = (N_AL_Struct81s *)arg0->node.prev;
} }
alUnlink((ALLink *)arg0); alUnlink((ALLink *)arg0);
@@ -468,12 +468,12 @@ void func_802444C0(Struct81s *arg0){
} }
} }
void func_80244594(Struct81s *arg0, u8 arg1){ void func_80244594(N_AL_Struct81s *arg0, u8 arg1){
if(arg0 != NULL) if(arg0 != NULL)
arg0->unk36 = arg1; arg0->unk36 = arg1;
} }
s32 func_802445AC(Struct81s *arg0){ s32 func_802445AC(N_AL_Struct81s *arg0){
if(arg0 != NULL) if(arg0 != NULL)
return arg0->unk40; return arg0->unk40;
return 0; return 0;
@@ -490,12 +490,12 @@ bool func_802445C4(ALBank *bank, s16 arg1){
void *func_80244608(ALBank *bank, s16 arg1, struct46s *arg2) { void *func_80244608(ALBank *bank, s16 arg1, struct46s *arg2) {
ALKeyMap *temp_v0_2; ALKeyMap *temp_v0_2;
ALSound *temp_s2; ALSound *temp_s2;
Struct81s *temp_v0; N_AL_Struct81s *temp_v0;
s32 var_s3; s32 var_s3;
s16 sp6E; s16 sp6E;
s32 sp68; s32 sp68;
s32 var_s4; s32 var_s4;
Struct81s *var_fp; N_AL_Struct81s *var_fp;
ALEvent sp50; ALEvent sp50;
ALEvent sp40; ALEvent sp40;
@@ -548,7 +548,7 @@ void *func_80244608(ALBank *bank, s16 arg1, struct46s *arg2) {
return var_fp; return var_fp;
} }
void func_80244814(Struct81s *arg0){ void func_80244814(N_AL_Struct81s *arg0){
ALEvent evt; ALEvent evt;
evt.type = 0x400; evt.type = 0x400;
@@ -562,10 +562,10 @@ void func_80244814(Struct81s *arg0){
void func_80244860(u8 arg0) { void func_80244860(u8 arg0) {
OSIntMask mask; OSIntMask mask;
ALEvent evt; ALEvent evt;
Struct81s *var_s0; N_AL_Struct81s *var_s0;
mask = osSetIntMask(1U); mask = osSetIntMask(1U);
for(var_s0 = D_802758C0.unk0; var_s0 != NULL; var_s0 = (Struct81s *)var_s0->node.next){ for(var_s0 = D_802758C0.unk0; var_s0 != NULL; var_s0 = (N_AL_Struct81s *)var_s0->node.next){
evt.type = 0x400; evt.type = 0x400;
((s32 *)&evt.msg)[0] = (s32)var_s0; ((s32 *)&evt.msg)[0] = (s32)var_s0;
if ((var_s0->unk3F & arg0) == arg0) { if ((var_s0->unk3F & arg0) == arg0) {
@@ -604,7 +604,7 @@ s32 func_802449C4(u8 arg0){
} }
void func_802449E4(u8 arg0, u16 arg1) { void func_802449E4(u8 arg0, u16 arg1) {
Struct81s *var_s0; N_AL_Struct81s *var_s0;
s32 pad30; s32 pad30;
ALEvent evt; ALEvent evt;
@@ -616,7 +616,7 @@ void func_802449E4(u8 arg0, u16 arg1) {
((s32 *)&evt.msg)[0] = var_s0; ((s32 *)&evt.msg)[0] = var_s0;
alEvtqPostEvent(&D_802758CC->evtq, &evt, 0); alEvtqPostEvent(&D_802758CC->evtq, &evt, 0);
} }
var_s0 = (Struct81s *)var_s0->node.next; var_s0 = (N_AL_Struct81s *)var_s0->node.next;
} }
} }