mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-08-15 05:10:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

Matches in external and some namings in ceremony (#281)

Browse Source 
* Matches in external and some namings in ceremony
This commit is contained in:
MegaMech
2022-12-06 19:25:16 -07:00
committed by GitHub
parent 10ae9a7970
commit 3172daa2ea
25 changed files with 151 additions and 728 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/audio/external.c
+66 -185
View File
@@ -9,7 +9,7 @@
#include "audio/data.h"
#include <sounds.h>
// REQUIRES void in the argument list to match properly
// Requires void in the argument list to match properly.
void func_800C13F0(void) {
}
@@ -1250,7 +1250,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C3608.s")
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_801930D0;
void func_800C36C4(s32 arg0, s32 arg1, s8 arg2, s8 arg3) {
void func_800C36C4(s32 arg0, s32 arg1, u8 arg2, s8 arg3) {
void *temp_v0;
temp_v0 = ((arg0 & 0xFF) * 0x24C) + &D_801930D0;
@@ -4228,67 +4228,42 @@ void func_800C8CCC(void) {
GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8CCC.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void play_sound(s32, ? *, ?, ? *, ? *, ? *); // extern
extern ? D_800EA1C8;
extern ? D_800EA1D4;
extern ? D_800EA1DC;
extern u8 D_800EA1D4;
void play_sound2(s32 arg0) {
s32 phi_a0;
s32 phi_a0_2;
void play_sound2(s32 soundBits) {
phi_a0 = arg0;
if ((arg0 == SOUND_ACTION_REV_ENGINE) && (gCurrentCourseId == 0x12)) {
phi_a0 = 0x49008027;
if ((soundBits == SOUND_ACTION_REV_ENGINE) && (gCurrentCourseId == 0x12)) {
soundBits = 0x49008027;
}
phi_a0_2 = phi_a0;
if ((phi_a0 == SOUND_ACTION_REV_ENGINE_2) && (gCurrentCourseId == 0x12)) {
phi_a0_2 = 0x49008028;
if ((soundBits == SOUND_ACTION_REV_ENGINE_2) && (gCurrentCourseId == 0x12)) {
soundBits = 0x49008028;
}
play_sound(phi_a0_2, &D_800EA1C8, 4, &D_800EA1D4, &D_800EA1D4, &D_800EA1DC);
play_sound(soundBits, &D_800EA1C8, 4, &D_800EA1D4, &D_800EA1D4, &D_800EA1DC);
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/play_sound2.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_800C3448(s32); // extern
void func_800C3448(s32);
extern u16 D_800EA15C;
void func_800C8EAC(u16 arg0) {
func_800C3448(arg0 | 0x10000);
D_800EA15C = arg0;
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8EAC.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_800C3448(s32); // extern
void func_800C3448(s32);
extern u16 D_800EA160;
void func_800C8EF8(u16 arg0) {
func_800C3448(arg0 | 0x1010000);
D_800EA160 = arg0;
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8EF8.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_800C36C4(?, ?, s32, ?); // extern
void func_800C8F44(s32 arg0) {
func_800C36C4(0, 0, arg0 & 0xFF, 1);
void func_800C36C4(s32 arg0, s32 arg1, u8 arg2, s8 arg3);
void func_800C8F44(u8 arg0) {
func_800C36C4(0, 0, arg0, 1);
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8F44.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -4814,77 +4789,49 @@ void func_800C9D80(Vec3f position, Vec3f velocity, u32 soundBits) {
GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9D80.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800C21E8(s32, ?); // extern
void func_800C5578(s32, ?); // extern
extern u8 D_800EA1C0;
void func_800C9EF4(s32 arg0, ? arg1) {
s32 temp_t8;
s32 temp_v0;
s32 phi_s0;
f32 *func_800C21E8(s32, s32);
void func_800C5578(s32, s32);
phi_s0 = 0;
if ((D_800EA1C0 + 1) > 0) {
do {
temp_v0 = func_800C21E8(arg0, arg1);
if (temp_v0 != 0) {
func_800C5578(temp_v0, arg1);
}
temp_t8 = (phi_s0 + 1) & 0xFF;
phi_s0 = temp_t8;
} while (temp_t8 < (D_800EA1C0 + 1));
void func_800C9EF4(s32 arg0, s32 arg1) {
f32 *temp;
u8 i;
for (i = 0; i < D_800EA1C0 + 1; i++) {
temp = func_800C21E8(arg0, arg1);
if (temp != 0) {
func_800C5578(temp, arg1);
}
}
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9EF4.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_800CBBB8(?, ?); // extern
void play_sound2(?); // extern
extern s8 D_800EA16C;
void func_800C9F90(s32 arg0) {
if ((arg0 & 0xFF) != 0) {
void func_800C9F90(u8 arg0) {
if ((arg0) != 0) {
play_sound2(SOUND_ACTION_GO_BACK_2);
func_800CBBB8(0xF1000000, 0);
D_800EA16C = 1;
return;
} else {
play_sound2(SOUND_ACTION_UNKNOWN_CONFIRMATION);
func_800CBBB8(0xF2000000, 0);
D_800EA16C = 0;
}
play_sound2(SOUND_ACTION_UNKNOWN_CONFIRMATION);
func_800CBBB8(0xF2000000, 0);
D_800EA16C = 0;
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9F90.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_800C3448(s32); // extern
void func_800C36C4(?, ?, ?, ?); // extern
void func_800CA008(u8 arg0, u8 arg1) {
u8 phi_v0;
// u8 phi_v0;
func_800C36C4(0, 0, 0x7F, 1);
func_800C36C4(1, 0, 0x7F, 1);
phi_v0 = arg1;
//phi_v0 = arg1;
if (arg1 >= 4) {
if ((arg1 == 0xC) || (arg1 == 4)) {
phi_v0 = 5;
arg1 = 5;
} else {
phi_v0 = 4;
arg1 = 4;
}
}
func_800C3448((arg0 << 8) | 0xF0000000 | phi_v0);
func_800C3448((arg0 << 8) | 0xF0000000 | arg1);
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA008.s")
#endif
// With -framepointer active, you CANNOT put void
// in the argument list, causes a minor stack difference
@@ -4900,17 +4847,10 @@ void func_800CA0CC() {
D_800EA108 = 1;
}
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_800C5278(?); // extern
void func_800CA0E4(void) {
func_800C5278(3);
func_800C5278(5);
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA0E4.s")
#endif
#ifdef MIPS_TO_C
switch(D_800EA1C0) {
@@ -4990,42 +4930,27 @@ void func_800CA118(s32 arg0) {
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA118.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_800EA0EC;
extern u8 D_800EA0EC[];
void func_800CA24C(s32 arg0) {
*(&D_800EA0EC + (arg0 & 0xFF)) = 2;
void func_800CA24C(u8 arg0) {
D_800EA0EC[arg0] = 2;
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA24C.s")
#endif
void func_800CA270() {
D_800EA0F4 = 1;
}
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_800E9F90;
extern u8 D_800E9F90[];
void func_800CA288(s32 arg0, s8 arg1) {
*(&D_800E9F90 + ((arg0 & 0xFF) * 0x3C)) = arg1;
// appears to write u8 in list of f32s?
// However, 0x3C is 0.0f which could likely get confused with `u8 = 0`;
void func_800CA288(u8 arg0, s8 arg1) {
D_800E9F90[arg0 * 0x3C] = arg1; // * 0x3C
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA288.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_800E9F90;
void func_800CA2B8(s32 arg0) {
*(&D_800E9F90 + ((arg0 & 0xFF) * 0x3C)) = 0;
void func_800CA2B8(u8 arg0) {
D_800E9F90[arg0 * 0x3C] = 0;
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA2B8.s")
#endif
void func_800CA2E4(u8 arg0, s8 arg1) {
D_800EA06C[arg0].unk0C = arg1;
@@ -5035,48 +4960,23 @@ void func_800CA30C(u8 arg0) {
D_800EA06C[arg0].unk0C = 0;
}
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_800C3448(s32, s32); // extern
void func_800CA330(s32 arg0) {
s32 sp34;
s32 temp_a1;
s32 temp_v0;
temp_a1 = arg0 & 0xFF;
temp_v0 = temp_a1 << 0x10;
sp34 = temp_v0;
func_800C3448(temp_v0 | 0x100000FF, temp_a1);
func_800C3448(temp_v0 | 0x110000FF);
void func_800CA330(u8 arg0) {
func_800C3448(arg0 << 0x10 | 0x100000FF);
func_800C3448(arg0 << 0x10 | 0x110000FF);
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA330.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_800C58B8(?, ?, s32); // extern
void func_800C58B8(u8, u8, u16); // extern
void func_800CA388(s32 arg0) {
s32 temp_s0;
temp_s0 = (arg0 * 2) & 0xFF;
func_800C58B8(0, 0, temp_s0 & 0xFFFF);
func_800C58B8(1, 0, temp_s0 & 0xFFFF);
func_800C58B8(2, 0, temp_s0 & 0xFFFF);
func_800C58B8(3, 0, temp_s0 & 0xFFFF);
func_800C58B8(5, 0, temp_s0 & 0xFFFF);
void func_800CA388(u8 arg0) {
arg0 *= 2;
func_800C58B8(0, 0, arg0);
func_800C58B8(1, 0, arg0);
func_800C58B8(2, 0, arg0);
func_800C58B8(3, 0, arg0);
func_800C58B8(5, 0, arg0);
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA388.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_800C3448(s32); // extern
s32 func_800C3508(?); // extern
void func_800C35E8(?); // extern
void func_800C3448(s32);
extern u8 D_800EA104;
void func_800CA414(u16 arg0, u16 arg1) {
@@ -5088,32 +4988,24 @@ void func_800CA414(u16 arg0, u16 arg1) {
}
D_800EA104 = 1;
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA414.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void func_800C3448(s32, ?); // extern
void func_800C8EF8(?); // extern
void func_800C9060(s32, ?); // extern
extern u8 D_800EA108;
extern u16 D_800EA15C;
extern u8 D_800EA164;
extern u8 D_800EA1C0;
extern u8 D_8018FC08;
void func_800CA49C(s32 arg0) {
void func_800CA49C(u8 arg0) {
if (D_800EA108 == 0) {
if (D_800EA1C0 >= 2) {
func_800C9060(arg0 & 0xFF, 0x1900FF3A);
func_800C9060(arg0, 0x1900FF3A);
} else if (D_800EA164 != 0) {
func_800C3448(0x100100FF, 0x19000000);
func_800C3448(0x100100FF); // 0x19000000
func_800C3448(0x110100FF);
func_800C8EF8(0xC);
func_800C3448(0xC1510011);
} else {
func_800C3448(0x100100FF, 0x19000000);
func_800C3448(0x100100FF); //0x19000000
func_800C3448(0x110100FF);
func_800C8EF8(0xC);
func_800C3448(D_800EA15C | 0xC1500000);
@@ -5122,9 +5014,6 @@ void func_800CA49C(s32 arg0) {
D_8018FC08 = D_8018FC08 + 1;
}
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA49C.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -5286,19 +5175,11 @@ void func_800CA984(s32 arg0) {
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA984.s")
#endif
#ifdef MIPS_TO_C
//generated by m2c commit 0927f17aac197848d4ebdf0c6bbad74b01f0851c
? func_800C5578(f32 *, ?); /* extern */
s8 D_800EA108 = 0; /* const */
void func_800CAACC(s32 playerId) {
void func_800CAACC(u8 playerId) {
if ((u8) D_800EA108 == 0) {
func_800C5578(func_800C21E8(((playerId & 0xFF) * 0xDD8) + 0x14 + gPlayers, 0x31029008U), 0x31029008);
func_800C5578(func_800C21E8(gPlayers[playerId].pos, 0x31029008U), 0x31029008);
}
}
#else
GLOBAL_ASM("asm/non_matchings/audio/external/func_800CAACC.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
src/audio/external.h
+7 -7
View File
@@ -96,7 +96,7 @@ struct Unk_8018EFD8 *func_800C1C88(u8, Vec3f, Vec3f, f32*, u8, u32);
void func_800C1DA4(Camera*, Vec3s, struct Unk_8018EFD8*);
void func_800C1E2C(Camera*, Vec3f, struct Unk_8018EFD8*);
void func_800C1F8C();
f32 *func_800C21E8(f32*, u32);
f32 *func_800C21E8(s32, s32);
void func_800C4084(u16);
void play_sound(u32, f32*, u8, f32*, f32*, u8*);
void func_800C41CC(u8, struct Unk_80191420*);
@@ -108,7 +108,7 @@ void func_800C8770(u8);
void func_800C89E4();
void play_sound2(s32);
void func_800C8EAC(u16);
void func_800C8EF8();
void func_800C8EF8(u16);
void func_800C9060(u8, u32);
void func_800C90F4(u8, uintptr_t);
void func_800CA008(u8, u8);
@@ -119,11 +119,9 @@ void func_800CA118();
void func_800CA270();
void func_800CA2E4(u8, s8);
void func_800CA30C(u8);
void func_800CA330();
void func_800CA330(s32);
void func_800CA388();
void func_800CA388(s32);
void func_800CA49C();
void func_800CA330(u8);
void func_800CA388(u8);
void func_800CA49C(u8);
void func_800CB134();
void func_800CB2C4(void);
@@ -171,4 +169,6 @@ extern Vec3f D_800EA1C8;// = {0.0f, 0.0f, 0.0f}
extern u8 D_800EA1DC;// = 0;
extern u8 D_800EA244;
extern s8 D_800EA16C;
#endif