code_801A4EB0 & all of voice, OK

This commit is contained in:
engineer124
2021-11-11 19:23:33 +11:00
parent 716de8820e
commit 957bc0b65f
2 changed files with 33 additions and 6 deletions
+30 -3
View File
@@ -4,14 +4,16 @@ void func_801A5080(u16 arg0);
s32 func_801A5228(u8* arg0);
void func_801A53E8(u16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4);
s32 func_801A5808(void);
OSVoiceData* func_801A5390(void);
void func_801A5680(u16 arg0);
void func_801A54D0(u16 arg0);
u8* func_801A54C4(void);
extern u8 D_801D8BE0;
extern OSVoiceHandle D_801FD5B8;
extern OSVoiceData* D_801D8E40;
extern u8 D_801D8E48;
void func_801A4EB0(void) {
}
@@ -90,4 +92,29 @@ u8 func_801A510C(void) {
return D_801D8E3C;
}
#pragma GLOBAL_ASM("asm/non_matchings/code/code_801A4EB0/func_801A5118.s")
void func_801A5118(void) {
if (D_801D8E3C & 2) {
D_801D8E3C &= 1;
func_801A4EB8();
}
if (D_801D8E3C != 0) {
if (func_801A5808() != 0) {
D_801D8E48++;
if (D_801D8E48 == 0xA) {
D_801D8E3C = 0;
D_801D8E44 = 0xFFFF;
return;
}
} else {
D_801D8E48 = 0;
}
D_801D8E40 = func_801A5390();
if (D_801D8E40 != 0) {
D_801D8E44 = D_801D8E40->answer[0];
} else {
D_801D8E44 = 0xFFFF;
}
}
}
+3 -3
View File
@@ -253,9 +253,9 @@ s32 func_801A5680(u16 arg0) {
return errorCode;
}
void func_801A5808(void) {
s32 func_801A5808(void) {
s32 errorCode = 0;
s32 pad;
s32 ret;
OSMesgQueue* msgQ;
switch (D_801FD5A0.unk_04) {
@@ -307,7 +307,7 @@ void func_801A5808(void) {
break;
}
func_801A51F0(errorCode);
return func_801A51F0(errorCode);
}
void func_801A5A10(void) {