Change a variety of constants to defines (#257)

* Change a variety of constants to defines

* Add notes regarding menu columns

* Change unknown type to known types
This commit is contained in:
coco875 2022-09-19 05:54:14 +02:00 committed by GitHub
parent 2c57c81f3a
commit 32358c30fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 3064 additions and 2923 deletions

View File

@ -520,7 +520,7 @@ void update_obj_kiwano_fruit(struct KiwanoFruit *fruit) {
player->unk_034[0] -= temp_f2 * 0.7f;
player->unk_034[2] -= temp_f14 * 0.7f;
func_800C9060(player - gPlayerOne, 0x19007018U);
if (gModeSelection != 0) {
if (gModeSelection != GRAND_PRIX) {
D_80162DF8 = 1;
}
}
@ -1450,7 +1450,7 @@ void func_8029B06C(Camera *arg0, struct Actor *arg1) {
break;
}
if (gActiveScreenMode == 0) {
if (gActiveScreenMode == SCREEN_MODE_1P) {
if (temp_f0 < 160000.0f) {
gSPDisplayList(gDisplayListHead++, &toads_turnpike_dl_0);
} else if (temp_f0 < 640000.0f) {
@ -1482,7 +1482,7 @@ void func_8029B2E4(Camera *arg0, struct Actor *arg1) {
func_802B5F74(spC8, arg1->pos, arg1->rot);
if (func_802B4FF8(spC8, 0) != 0) {
if (gActiveScreenMode == 0) {
if (gActiveScreenMode == SCREEN_MODE_1P) {
if (temp_f0 < 160000.0f) {
gSPDisplayList(gDisplayListHead++, &toads_turnpike_dl_3);
} else if (temp_f0 < 640000.0f) {
@ -1514,7 +1514,7 @@ void func_8029B4E0(Camera *arg0, struct Actor *arg1) {
func_802B5F00(spC8, 0.1f);
if (func_802B4FF8(spC8, 0) != 0) {
if (gActiveScreenMode == 0) {
if (gActiveScreenMode == SCREEN_MODE_1P) {
if (temp_f0 < 160000.0f) {
gSPDisplayList(gDisplayListHead++, &toads_turnpike_dl_9);
} else if (temp_f0 < 640000.0f) {
@ -1545,7 +1545,7 @@ void func_8029B6EC(Camera *camera, struct Actor* arg1) {
func_802B5F74(spC8, arg1->pos, arg1->rot);
if (func_802B4FF8(spC8, 0) != 0) {
if (gActiveScreenMode == 0) {
if (gActiveScreenMode == SCREEN_MODE_1P) {
if (temp_f0 < 160000.0f) {
gSPDisplayList(gDisplayListHead++, &toads_turnpike_dl_6);
@ -3323,7 +3323,7 @@ void func_802A0450(Player *player, struct Actor *actor) {
if (!(player->unk_0BC & 0x80000000) && !(player->unk_000 & 0x100)) {
if (func_8029FB80(player, actor) == 1) {
func_800C98B8(actor->pos, actor->velocity, 0x19009005U);
if ((gModeSelection == 1) && !(player->unk_000 & 0x1000)) {
if ((gModeSelection == TIME_TRIALS) && !(player->unk_000 & 0x1000)) {
D_80162DF8 = 1;
}
if (player->unk_0BC & 0x200) {

View File

@ -62,8 +62,8 @@ GLOBAL_ASM("asm/non_matchings/audio/effects/func_800BDE50.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BDE50(s32, u32); // extern
? func_800BEF2C(void *); // extern
void func_800BDE50(s32, u32); // extern
void func_800BEF2C(void *); // extern
extern ? D_803B5EF0;
void func_800BDFF8(void *arg0) {
@ -113,7 +113,7 @@ GLOBAL_ASM("asm/non_matchings/audio/effects/func_800BDFF8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? gPitchBendFrequencyScale;
extern f32 gPitchBendFrequencyScale;
f32 func_800BE158(void *arg0) {
u32 temp_v0;
@ -149,7 +149,7 @@ GLOBAL_ASM("asm/non_matchings/audio/effects/func_800BE22C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800BE22C(u16); // extern
extern ? gPitchBendFrequencyScale;
extern f32 gPitchBendFrequencyScale;
f32 func_800BE270(void *arg0, u16 arg1) {
f32 temp_f0;

View File

@ -83,7 +83,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C1480.s")
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern s8 D_8018EF10;
extern ? D_80191420;
extern ? D_803B17D0;
extern s32 D_803B17D0;
extern ? D_803B5EF0;
s8 func_800C15D0(s32 arg0, s32 arg1, s32 arg2) {
@ -242,8 +242,8 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C1934.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800CBB88(s32, f32); /* extern */
? func_800CBBE8(s32, s8); /* extern */
void func_800CBB88(s32, f32); /* extern */
void func_800CBBE8(s32, s8); /* extern */
extern ? D_8018EF18;
extern ? D_80191420;
extern ? D_80192C48;
@ -421,8 +421,8 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C1E2C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C1DA4(s32, s32, void *); // extern
? func_800C1E2C(s32, ? *, void *); // extern
void func_800C1DA4(s32, s32, void *); // extern
void func_800C1E2C(s32, ? *, void *); // extern
extern u8 D_800EA1C0;
extern ? D_800EA1C8;
extern u8 D_800EA244;
@ -552,10 +552,10 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C21E8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8001AAAC(s16, s16, s16); // extern
? func_800CBBE8(s32, ?, s32, s32); // extern
void func_8001AAAC(s16, s16, s16); // extern
void func_800CBBE8(s32, ?, s32, s32); // extern
extern ? D_8018FC10;
extern ? D_803B1510;
extern u32 D_803B1510;
void func_800C2274(s32 arg0) {
s16 sp46;
@ -638,7 +638,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C2274.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800CBBB8(?, ?); // extern
void func_800CBBB8(?, ?); // extern
extern ? D_800E9DB4;
extern ? D_800E9DF4;
extern ? D_800E9E74;
@ -679,7 +679,7 @@ extern ? D_8018FBA8;
extern ? D_8018FBD8;
extern s8 D_8018FC08;
extern ? D_8018FC10;
extern ? gPlayers;
extern Player gPlayers;
void func_800C2474(void) {
s32 temp_lo;
@ -806,8 +806,8 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C2474.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800CBB88(s32, f32, void *); // extern
? func_800CBBB8(s32, s32, s32); // extern
void func_800CBB88(s32, f32, void *); // extern
void func_800CBBB8(s32, s32, s32); // extern
extern u8 D_800EA1EC;
extern ? D_801930D0;
@ -859,7 +859,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C284C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800CBBB8(s32, s32); // extern
void func_800CBBB8(s32, s32); // extern
extern ? D_80193318;
void func_800C29B4(u8 arg0, s32 arg1) {
@ -872,12 +872,12 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C29B4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800C13FC(s32, s32); /* extern */
? func_800C284C(u8, u8, u8, u32); /* extern */
? func_800C29B4(u8, s32); /* extern */
? func_800C5C40(); /* extern */
? func_800CBBB8(?, u8); /* extern */
? func_800CBBE8(s32, s8, s8, s32); /* extern */
void func_800C13FC(s32, s32); /* extern */
void func_800C284C(u8, u8, u8, u32); /* extern */
void func_800C29B4(u8, s32); /* extern */
void func_800C5C40(); /* extern */
void func_800CBBB8(?, u8); /* extern */
void func_800CBBE8(s32, s8, s8, s32); /* extern */
extern ? D_80192CA8;
extern ? D_80192CC6;
extern ? D_801930D0;
@ -1275,7 +1275,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C3448.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C2A2C(s32); // extern
void func_800C2A2C(s32); // extern
extern u8 D_800EA1E4;
extern u8 D_800EA1E8;
extern ? D_80192CD0;
@ -1295,7 +1295,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C3478.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_80193318;
extern ? D_803B1510;
extern u32 D_803B1510;
u16 func_800C3508(s32 arg0) {
? sp-10;
@ -1318,7 +1318,7 @@ extern u8 D_800EA1E4;
extern u8 D_800EA1E8;
extern ? D_80192CD0;
? func_800C357C(s32 arg0) {
s32 func_800C357C(s32 arg0) {
? sp-10;
s32 temp_t9;
u8 temp_a1;
@ -1417,12 +1417,12 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C36C4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800C3448(s32, s8, s32); /* extern */
? func_800C36C4(s32, ?, ?, ?); /* extern */
? func_800CBB88(s32, f32, s32); /* extern */
? func_800CBBB8(s32, s32); /* extern */
void func_800C3448(s32, s8, s32); /* extern */
void func_800C36C4(s32, ?, ?, ?); /* extern */
void func_800CBB88(s32, f32, s32); /* extern */
void func_800CBBB8(s32, s32); /* extern */
extern ? D_801930D0;
extern ? D_803B1510;
extern u32 D_803B1510;
void func_800C3724(void) {
f32 temp_f0;
@ -1934,7 +1934,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C41CC.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C40F0(u8, s32, s32 *, u8); // extern
void func_800C40F0(u8, s32, s32 *, u8); // extern
extern ? D_800EA1A0;
extern u8 D_800EA1BC;
extern u8 D_800EA1C0;
@ -2183,7 +2183,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C4398.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C40F0(u8, u8, void *, u8); // extern
void func_800C40F0(u8, u8, void *, u8); // extern
extern ? D_800EA1C8;
extern f32 D_800F3668;
extern ? D_80191420;
@ -2244,8 +2244,8 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C473C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C473C(s32, u8, void *, u8); // extern
? func_800CBBE8(s32, ?); // extern
void func_800C473C(s32, u8, void *, u8); // extern
void func_800CBBE8(s32, ?); // extern
extern ? D_800EA188;
extern u8 D_800EA1C0;
extern ? D_800EA1C8;
@ -2602,9 +2602,9 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C4888.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C19D0(s32, s32, u8); // extern
? func_800C473C(s32, s32); // extern
? func_800CBBE8(s32, s8, u8); // extern
void func_800C19D0(s32, s32, u8); // extern
void func_800C473C(s32, s32); // extern
void func_800CBBE8(s32, s8, u8); // extern
extern ? D_800EA188;
extern u8 D_800EA1C0;
extern u16 D_800EA1C4;
@ -2612,7 +2612,7 @@ extern ? D_80191420;
extern ? D_80192AB8;
extern u8 D_80192C38;
extern ? D_801930D0;
extern ? D_803B17D0;
extern s32 D_803B17D0;
void func_800C4FE4(s32 arg0) {
void *sp50;
@ -2679,9 +2679,9 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C4FE4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C41CC(?, ? *); // extern
? func_800C473C(s32, s32); // extern
? func_800CBBE8(s32, ?); // extern
void func_800C41CC(?, ? *); // extern
void func_800C473C(s32, s32); // extern
void func_800CBBE8(s32, ?); // extern
extern ? D_80191420;
void func_800C5278(s32 arg0) {
@ -2713,8 +2713,8 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5278.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C473C(s32, s32); // extern
? func_800CBBE8(s32, ?); // extern
void func_800C473C(s32, s32); // extern
void func_800CBBE8(s32, ?); // extern
extern ? D_80191420;
void func_800C5384(s32 arg0, s32 arg1) {
@ -2772,8 +2772,8 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C54B8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C41CC(?, s32 *); // extern
? func_800C5384(s32, s32); // extern
void func_800C41CC(?, s32 *); // extern
void func_800C5384(s32, s32); // extern
void func_800C550C(s32 arg0) {
s32 sp3C;
@ -2795,9 +2795,9 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C550C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C41CC(?, s32 *); // extern
? func_800C473C(s32, s32); // extern
? func_800CBBE8(s32, ?); // extern
void func_800C41CC(?, s32 *); // extern
void func_800C473C(s32, s32); // extern
void func_800CBBE8(s32, ?); // extern
extern ? D_80191420;
void func_800C5578(s32 arg0, s32 arg1) {
@ -2855,9 +2855,9 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5578.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C41CC(?, ? *); // extern
? func_800C473C(s32, s32); // extern
? func_800CBBE8(s32, ?); // extern
void func_800C41CC(?, ? *); // extern
void func_800C473C(s32, s32); // extern
void func_800CBBE8(s32, ?); // extern
extern ? D_80191420;
void func_800C56F0(s32 arg0) {
@ -2905,7 +2905,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C56F0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C4398(); // extern
void func_800C4398(); // extern
extern u8 D_800EA1B8;
extern u8 D_800EA1BC;
@ -2990,9 +2990,9 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5968.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C4888(s32); // extern
? func_800C4FE4(s32); // extern
? func_800C5968(s32); // extern
void func_800C4888(s32); // extern
void func_800C4FE4(s32); // extern
void func_800C5968(s32); // extern
extern s8 D_80192C38;
extern s32 D_803B17D0;
extern ? D_803B5EF0;
@ -3108,10 +3108,10 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5A3C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800CBBE8(s32, ?); // extern
void func_800CBBE8(s32, ?); // extern
extern ? D_800EA154;
extern u8 D_800EA1C0;
extern ? gPlayers;
extern Player gPlayers;
void func_800C5BD0(void) {
if (D_800EA1C0 == 0) {
@ -3126,12 +3126,12 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5BD0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C2474(); // extern
? func_800C284C(?, ?, ?, ?); // extern
? func_800C3F70(); // extern
? func_800C400C(); // extern
? func_800C5A3C(); // extern
? func_800C5BD0(); // extern
void func_800C2474(); // extern
void func_800C284C(?, ?, ?, ?); // extern
void func_800C3F70(); // extern
void func_800C400C(); // extern
void func_800C5A3C(); // extern
void func_800C5BD0(); // extern
extern u8 D_800E9DA0;
void func_800C5C40(void) {
@ -3173,13 +3173,13 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5CB8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C94A4(u8); // extern
? func_800C97C4(s32, u8); // extern
void func_800C94A4(u8); // extern
void func_800C97C4(s32, u8); // extern
extern ? D_800E9E24;
extern ? D_800E9E34;
extern ? D_800EA0EC;
extern u8 D_800EA16C;
extern ? gPlayers;
extern Player gPlayers;
void func_800C5D04(u8 arg0) {
s32 *temp_a0;
@ -3242,8 +3242,8 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C5D04.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C9018(s32, ?, u8, void *); // extern
? play_sound(?, void *, u8, void *, void *, void *); // extern
void func_800C9018(s32, ?, u8, void *); // extern
void play_sound(?, void *, u8, void *, void *, void *); // extern
extern ? D_800E9DC4;
extern ? D_800E9DD4;
extern ? D_800E9E14;
@ -3260,7 +3260,7 @@ extern ? D_800EA130;
extern u8 D_800EA16C;
extern u8 D_800EA1C0;
extern f32 D_800F3674;
extern ? gPlayers;
extern Player gPlayers;
void func_800C5E38(u8 arg0) {
s32 sp3C;
@ -3370,7 +3370,7 @@ extern f32 D_800F3684;
extern f32 D_800F3688;
extern f32 D_800F368C;
extern f32 D_800F3690;
extern ? gPlayers;
extern Player gPlayers;
void func_800C6108(s32 arg0) {
? sp-10;
@ -3593,7 +3593,7 @@ extern ? D_800E9F14;
extern f32 D_800F3730;
extern f32 D_800F3734;
extern f32 D_800F3738;
extern ? gPlayers;
extern Player gPlayers;
void func_800C6758(s32 arg0) {
? sp-10;
@ -3625,8 +3625,8 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C6758.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800C5578(void *, s32, u8); /* extern */
? play_sound(?, void *, u8, ? *, ? *, void *); /* extern */
void func_800C5578(void *, s32, u8); /* extern */
void play_sound(?, void *, u8, ? *, ? *, void *); /* extern */
static ? D_800E9E74; /* unable to generate initializer; const */
static ? D_800E9E84; /* unable to generate initializer; const */
static ? D_800E9E94; /* unable to generate initializer; const */
@ -4027,18 +4027,18 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C70A8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C3448(?, ?); // extern
void func_800C3448(?, ?); // extern
s32 func_800C3508(?); // extern
? func_800C5278(?); // extern
? func_800C5578(void *, s32); // extern
? func_800C8EF8(?); // extern
? func_800C9018(u8, ?); // extern
? func_800C9060(u8, ?); // extern
? func_800C90F4(u8, s32, s8 *, s32); // extern
? func_800C97C4(u8); // extern
? func_800C9A88(u8); // extern
? func_800C9D0C(u8); // extern
? func_800CA414(?, ?); // extern
void func_800C5278(?); // extern
void func_800C5578(void *, s32); // extern
void func_800C8EF8(?); // extern
void func_800C9018(u8, ?); // extern
void func_800C9060(u8, ?); // extern
void func_800C90F4(u8, s32, s8 *, s32); // extern
void func_800C97C4(u8); // extern
void func_800C9A88(u8); // extern
void func_800C9D0C(u8); // extern
void func_800CA414(?, ?); // extern
extern s32 gPlayerWinningIndex;
extern ? D_800E9E74;
extern ? D_800E9E94;
@ -4054,7 +4054,7 @@ extern ? D_800EA130;
extern u8 D_800EA1C0;
extern s8 D_801657E5;
extern u8 D_8018ED90;
extern ? gPlayers;
extern Player gPlayers;
void func_800C76C0(u8 arg0) {
s32 sp38;
@ -4457,16 +4457,16 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C76C0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C9018(s32, ?); // extern
? func_800C94A4(s32); // extern
? func_800C97C4(s32); // extern
? play_sound(s32, void *, s32, ? *, ? *, void *); // extern
void func_800C9018(s32, ?); // extern
void func_800C94A4(s32); // extern
void func_800C97C4(s32); // extern
void play_sound(s32, void *, s32, ? *, ? *, void *); // extern
extern ? D_800E9F74;
extern ? D_800E9F7C;
extern ? D_800EA0EC;
extern u8 D_800EA1C0;
extern ? D_800EA1D4;
extern ? gPlayers;
extern Player gPlayers;
void func_800C847C(s32 arg0) {
void *sp3C;
@ -4527,9 +4527,9 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C847C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C90F4(s32, s32); // extern
void func_800C90F4(s32, s32); // extern
extern ? D_800E9F24;
extern ? gPlayers;
extern Player gPlayers;
void func_800C86D8(s32 arg0) {
s32 temp_t6;
@ -4557,7 +4557,7 @@ extern f32 D_800F389C;
extern f32 D_800F38A0;
extern f32 D_800F38A4;
extern f32 D_800F38A8;
extern ? gPlayers;
extern Player gPlayers;
void func_800C8770(s32 arg0) {
? sp-10;
@ -4635,9 +4635,9 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8770.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800CAC08(); // extern
void func_800CAC08(); // extern
extern u8 D_800EA168;
extern ? gPlayers;
extern Player gPlayers;
void func_800C8920(void) {
if ((D_800EA168 != 0) && ((gPlayers.unkBC & 0x40000000) != 0x40000000) && ((gPlayers.unkE94 & 0x40000000) != 0x40000000) && ((gPlayers.unk1C6C & 0x40000000) != 0x40000000) && ((gPlayers.unk2A44 & 0x40000000) != 0x40000000) && ((gPlayers.unk381C & 0x40000000) != 0x40000000) && ((gPlayers.unk45F4 & 0x40000000) != 0x40000000) && ((gPlayers.unk53CC & 0x40000000) != 0x40000000) && ((gPlayers.unk61A4 & 0x40000000) != 0x40000000)) {
@ -4792,21 +4792,21 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8C7C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C5D04(s32); // extern
? func_800C5E38(s32); // extern
? func_800C6108(s32); // extern
? func_800C64A0(s32); // extern
? func_800C6758(s32); // extern
? func_800C683C(s32); // extern
? func_800C70A8(s32); // extern
? func_800C76C0(s32); // extern
? func_800C847C(s32); // extern
? func_800C86D8(s32); // extern
? func_800C8770(s32); // extern
? func_800C8920(); // extern
? func_800C89E4(); // extern
? func_800C8AE4(); // extern
? func_800C8C7C(s32); // extern
void func_800C5D04(s32); // extern
void func_800C5E38(s32); // extern
void func_800C6108(s32); // extern
void func_800C64A0(s32); // extern
void func_800C6758(s32); // extern
void func_800C683C(s32); // extern
void func_800C70A8(s32); // extern
void func_800C76C0(s32); // extern
void func_800C847C(s32); // extern
void func_800C86D8(s32); // extern
void func_800C8770(s32); // extern
void func_800C8920(); // extern
void func_800C89E4(); // extern
void func_800C8AE4(); // extern
void func_800C8C7C(s32); // extern
extern u8 D_800EA1C0;
void func_800C8CCC(void) {
@ -4868,7 +4868,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8CCC.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? play_sound(s32, ? *, ?, ? *, ? *, ? *); // extern
void play_sound(s32, ? *, ?, ? *, ? *, ? *); // extern
extern ? D_800EA1C8;
extern ? D_800EA1D4;
extern ? D_800EA1DC;
@ -4893,7 +4893,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/play_sound2.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C3448(s32); // extern
void func_800C3448(s32); // extern
extern u16 D_800EA15C;
void func_800C8EAC(u16 arg0) {
@ -4906,7 +4906,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8EAC.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C3448(s32); // extern
void func_800C3448(s32); // extern
extern u16 D_800EA160;
void func_800C8EF8(u16 arg0) {
@ -4919,7 +4919,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8EF8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C36C4(?, ?, s32, ?); // extern
void func_800C36C4(?, ?, s32, ?); // extern
void func_800C8F44(s32 arg0) {
func_800C36C4(0, 0, arg0 & 0xFF, 1);
@ -4930,7 +4930,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8F44.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? play_sound(s32, void *, s32, ? *, ? *, ? *); // extern
void play_sound(s32, void *, s32, ? *, ? *, ? *); // extern
extern ? D_800E9F7C;
extern ? D_800EA0EC;
extern u8 D_800EA108;
@ -4963,7 +4963,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C8F80.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C5578(void *, s32); // extern
void func_800C5578(void *, s32); // extern
extern ? D_800E9F7C;
void func_800C9018(s32 arg0) {
@ -4978,7 +4978,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9018.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? play_sound(s32, void *, s32, ? *, ? *, void *); // extern
void play_sound(s32, void *, s32, ? *, ? *, void *); // extern
extern ? D_800E9F7C;
extern ? D_800EA0EC;
extern u8 D_800EA108;
@ -5012,7 +5012,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9060.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? play_sound(s32, void *, s32, ? *, ? *, void *); // extern
void play_sound(s32, void *, s32, ? *, ? *, void *); // extern
extern ? D_800E9F2C;
extern ? D_800E9F7C;
extern ? D_800EA0EC;
@ -5020,7 +5020,7 @@ extern u8 D_800EA108;
extern ? D_800EA150;
extern s16 D_800EA180;
extern ? D_800EA1D4;
extern ? gPlayers;
extern Player gPlayers;
void func_800C90F4(s32 arg0, s32 arg1) {
s32 temp_a2;
@ -5063,9 +5063,9 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C90F4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C90F4(s32, s32); // extern
void func_800C90F4(s32, s32); // extern
extern s32 D_803B7194;
extern ? gPlayers;
extern Player gPlayers;
void func_800C9250(s32 arg0) {
s32 temp_t6;
@ -5080,7 +5080,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9250.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void *func_800C1C88(s32, void *, void *, ? *, s32, s32); // extern
? play_sound(s32, void *, s32, ? *, ? *, void *); // extern
void play_sound(s32, void *, s32, ? *, ? *, void *); // extern
extern ? D_800E9F2C;
extern ? D_800EA06C;
extern u8 D_800EA0F0;
@ -5089,7 +5089,7 @@ extern ? D_800EA150;
extern u8 D_800EA1C0;
extern ? D_800EA1C8;
extern ? D_800EA1D4;
extern ? gPlayers;
extern Player gPlayers;
void func_800C92CC(s32 arg0, s32 arg1) {
void *sp68;
@ -5135,7 +5135,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C92CC.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? play_sound(s32, void *, s32, void *, void *, void *); /* extern */
void play_sound(s32, void *, s32, void *, void *, void *); /* extern */
static ? D_800E9F74; /* unable to generate initializer; const */
static ? D_800E9F7C; /* unable to generate initializer; const */
static ? D_800EA0EC; /* unable to generate initializer; const */
@ -5251,9 +5251,9 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C94A4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C5578(void *, s32, s32); // extern
void func_800C5578(void *, s32, s32); // extern
extern ? D_800E9F7C;
extern ? gPlayers;
extern Player gPlayers;
void func_800C97C4(s32 arg0) {
s32 temp_a2;
@ -5276,7 +5276,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C97C4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void *func_800C1C88(?, s32, ?, ? *, s32, s32); // extern
? play_sound(s32, void *, s32, void *, ? *, ? *); // extern
void play_sound(s32, void *, s32, void *, ? *, ? *); // extern
extern u8 D_800EA0F0;
extern u8 D_800EA108;
extern u8 D_800EA1C0;
@ -5312,7 +5312,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C98B8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800C21E8(s32, ?); // extern
? func_800C5578(s32, ?); // extern
void func_800C5578(s32, ?); // extern
extern u8 D_800EA108;
extern u8 D_800EA1C0;
@ -5341,7 +5341,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C99E0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? play_sound(s32, void *, s32, void *, void *, void *); /* extern */
void play_sound(s32, void *, s32, void *, void *, void *); /* extern */
static ? D_800EA06C; /* unable to generate initializer; const */
void func_800C9A88(s32 playerId) {
@ -5436,8 +5436,8 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9A88.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800C21E8(void *, s32, s32); // extern
? func_800C550C(s32); // extern
extern ? gPlayers;
void func_800C550C(s32); // extern
extern Player gPlayers;
void func_800C9D0C(s32 arg0) {
s32 temp_a2;
@ -5454,11 +5454,11 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9D0C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
void *func_800C1C88(?, s32, s32, ? *, s32, s32); // extern
? play_sound(s32, void *, s32, ? *, ? *, ? *); // extern
void play_sound(s32, void *, s32, ? *, ? *, ? *); // extern
extern u8 D_800EA0F0;
extern u8 D_800EA108;
extern ? D_800EA178;
extern ? D_800EA17C;
extern f32 D_800EA178;
extern f32 D_800EA17C;
extern u8 D_800EA1C0;
extern ? D_800EA1C8;
extern ? D_800EA1D4;
@ -5499,7 +5499,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9D80.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800C21E8(s32, ?); // extern
? func_800C5578(s32, ?); // extern
void func_800C5578(s32, ?); // extern
extern u8 D_800EA1C0;
void func_800C9EF4(s32 arg0, ? arg1) {
@ -5525,8 +5525,8 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9EF4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800CBBB8(?, ?); // extern
? play_sound2(?); // extern
void func_800CBBB8(?, ?); // extern
void play_sound2(?); // extern
extern s8 D_800EA16C;
void func_800C9F90(s32 arg0) {
@ -5546,8 +5546,8 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800C9F90.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C3448(s32); // extern
? func_800C36C4(?, ?, ?, ?); // extern
void func_800C3448(s32); // extern
void func_800C36C4(?, ?, ?, ?); // extern
void func_800CA008(u8 arg0, u8 arg1) {
u8 phi_v0;
@ -5588,7 +5588,7 @@ void func_800CA0CC(void) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C5278(?); // extern
void func_800C5278(?); // extern
void func_800CA0E4(void) {
func_800C5278(3);
@ -5627,7 +5627,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA0E4.s")
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800CA0E4(? *, s8); // extern
void func_800CA0E4(? *, s8); // extern
extern ? D_800E9EA4;
extern ? D_800EA0EC;
extern s8 D_800EA0F0;
@ -5739,7 +5739,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA30C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C3448(s32, s32); // extern
void func_800C3448(s32, s32); // extern
void func_800CA330(s32 arg0) {
s32 sp34;
@ -5758,7 +5758,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA330.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C58B8(?, ?, s32); // extern
void func_800C58B8(?, ?, s32); // extern
void func_800CA388(s32 arg0) {
s32 temp_s0;
@ -5776,9 +5776,9 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA388.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C3448(s32); // extern
void func_800C3448(s32); // extern
s32 func_800C3508(?); // extern
? func_800C35E8(?); // extern
void func_800C35E8(?); // extern
extern u8 D_800EA104;
void func_800CA414(u16 arg0, u16 arg1) {
@ -5796,9 +5796,9 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA414.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C3448(s32, ?); // extern
? func_800C8EF8(?); // extern
? func_800C9060(s32, ?); // extern
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;
@ -5830,12 +5830,12 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA49C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C3448(?); // extern
void func_800C3448(?); // extern
s32 func_800C3508(?, ?); // extern
s32 func_800C357C(?); // extern
? func_800C8EF8(?, ?); // extern
? func_800C8F80(u8, ?); // extern
? play_sound(s32, void *, u8, ? *, ? *, void *); // extern
void func_800C8EF8(?, ?); // extern
void func_800C8F80(u8, ?); // extern
void play_sound(s32, void *, u8, ? *, ? *, void *); // extern
extern ? D_800E9F7C;
extern ? D_800EA0EC;
extern u8 D_800EA104;
@ -5845,7 +5845,7 @@ extern s8 D_800EA164;
extern u8 D_800EA1C0;
extern ? D_800EA1D4;
extern u8 D_8018FC08;
extern ? gPlayers;
extern Player gPlayers;
void func_800CA59C(u8 arg0) {
u8 temp_a2;
@ -5883,13 +5883,13 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA59C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C3448(s32, ?, u8); // extern
void func_800C3448(s32, ?, u8); // extern
s32 func_800C3508(?, ?, u8); // extern
s32 func_800C357C(?); // extern
? func_800C3608(?, ?, u8); // extern
? func_800C8EAC(u16); // extern
? func_800C9018(s32, ?, u8); // extern
? play_sound(s32, void *, u8, ? *, ? *, void *); // extern
void func_800C3608(?, ?, u8); // extern
void func_800C8EAC(u16); // extern
void func_800C9018(s32, ?, u8); // extern
void play_sound(s32, void *, u8, ? *, ? *, void *); // extern
extern ? D_800E9F7C;
extern ? D_800EA0EC;
extern u8 D_800EA104;
@ -5901,7 +5901,7 @@ extern u8 D_800EA1C0;
extern ? D_800EA1D4;
extern u8 D_8018FC08;
extern u32 D_803B1658;
extern ? gPlayers;
extern Player gPlayers;
void func_800CA730(u8 arg0) {
u8 *sp3C;
@ -5958,14 +5958,14 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA730.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800C1C88(s32, void *, ? *, void *, s32, s32); // extern
? play_sound(s32, s32, s32, ? *, ? *, ? *); // extern
void play_sound(s32, s32, s32, ? *, ? *, ? *); // extern
extern u8 D_800EA0F0;
extern u8 D_800EA108;
extern u8 D_800EA1C0;
extern ? D_800EA1C8;
extern ? D_800EA1D4;
extern ? D_800EA1DC;
extern ? gPlayers;
extern Player gPlayers;
void func_800CA984(s32 arg0) {
s32 temp_s5;
@ -5997,9 +5997,9 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CA984.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800C21E8(void *, ?, s32); // extern
? func_800C5578(s32, ?); // extern
void func_800C5578(s32, ?); // extern
extern u8 D_800EA108;
extern ? gPlayers;
extern Player gPlayers;
void func_800CAACC(s32 arg0) {
s32 temp_a2;
@ -6015,9 +6015,9 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CAACC.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C36C4(?, ?, ?, ?); // extern
? func_800C9060(u8, ?); // extern
? play_sound(?, ? *, ?, ? *, ? *, ? *); // extern
void func_800C36C4(?, ?, ?, ?); // extern
void func_800C9060(u8, ?); // extern
void play_sound(?, ? *, ?, ? *, ? *, ? *); // extern
extern ? D_800EA0EC;
extern u8 D_800EA108;
extern s8 D_800EA168;
@ -6052,8 +6052,8 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CAB4C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C36C4(?, ?, ?, ?); // extern
? func_800C56F0(?); // extern
void func_800C36C4(?, ?, ?, ?); // extern
void func_800C56F0(?); // extern
extern u8 D_800EA108;
extern s8 D_800EA168;
@ -6070,8 +6070,8 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CAC08.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C36C4(?, ?, ?, ?); // extern
? play_sound(?, ? *, ?, ? *, ? *, ? *); // extern
void func_800C36C4(?, ?, ?, ?); // extern
void play_sound(?, ? *, ?, ? *, ? *, ? *); // extern
extern u8 D_800EA0F0;
extern u8 D_800EA108;
extern ? D_800EA10C;
@ -6096,8 +6096,8 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CAC60.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C36C4(?, ?, ?, ?); // extern
? func_800C56F0(?); // extern
void func_800C36C4(?, ?, ?, ?); // extern
void func_800C56F0(?); // extern
extern u8 D_800EA108;
extern s8 D_800EA168;
extern ? D_800EA170;
@ -6117,7 +6117,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CAD40.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? play_sound(f32, ?, void *, s32, ? *, f32 *, void *); // extern
void play_sound(f32, ?, void *, s32, ? *, f32 *, void *); // extern
extern ? D_800E9F7C;
extern ? D_800EA0EC;
extern u8 D_800EA108;
@ -6169,7 +6169,7 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CADD0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? play_sound(f32, s32, void *, s32, ? *, f32 *, void *); // extern
void play_sound(f32, s32, void *, s32, ? *, f32 *, void *); // extern
extern ? D_800E9F7C;
extern ? D_800EA0EC;
extern u8 D_800EA108;
@ -6221,9 +6221,9 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CAEC4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C36C4(?, ?, ?, ?); // extern
? func_800C8F80(u8, ?); // extern
? func_800C9060(u8, ?); // extern
void func_800C36C4(?, ?, ?, ?); // extern
void func_800C8F80(u8, ?); // extern
void func_800C9060(u8, ?); // extern
extern ? D_800EA0EC;
extern u8 D_800EA108;
extern ? D_800EA170;
@ -6255,13 +6255,13 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CAFC0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C36C4(?, ?, ?, ?); // extern
? func_800C9018(u8, ?); // extern
? func_800C90F4(u8, s32); // extern
void func_800C36C4(?, ?, ?, ?); // extern
void func_800C9018(u8, ?); // extern
void func_800C90F4(u8, s32); // extern
extern u8 D_800EA108;
extern u8 D_800EA168;
extern ? D_800EA170;
extern ? gPlayers;
extern Player gPlayers;
void func_800CB064(u8 arg0) {
u8 *sp34;
@ -6292,9 +6292,9 @@ void func_800CB134(void) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C3448(?); // extern
? func_800C8EAC(?); // extern
? func_800C8EF8(?); // extern
void func_800C3448(?); // extern
void func_800C8EAC(?); // extern
void func_800C8EF8(?); // extern
extern u16 D_800EA174;
void func_800CB14C(void) {
@ -6369,14 +6369,14 @@ GLOBAL_ASM("asm/non_matchings/audio/external/func_800CB14C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
//? func_800C1F8C(); // extern
//? func_800C2274(?); // extern
//? func_800C3478(); // extern
//? func_800C3724(); // extern
//? func_800C5848(); // extern
//? func_800C59C4(); // extern
//? func_800C8CCC(); // extern
//? func_800CBC24(); // extern
//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
// run audio?
void func_800CB2C4(void) {

View File

@ -9,7 +9,7 @@ extern struct SoundAllocPool gNotesAndBuffersPool;
extern u8 D_803B0380;
extern u8 D_803B03C0;
extern ? D_803B0400;
extern ? D_803B0500;
extern u8 D_803B0500;
void func_800B8DE0(void) {
? *temp_v1_3;
@ -59,9 +59,9 @@ GLOBAL_ASM("asm/non_matchings/audio/heap/func_800B8DE0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BCB48(void *); // extern
? func_800BD6F4(void *); // extern
? func_800BF004(? *, void *); // extern
void func_800BCB48(void *); // extern
void func_800BD6F4(void *); // extern
void func_800BF004(? *, void *); // extern
extern s32 D_803B1508;
extern ? D_803B5FC8;
extern s32 gMaxSimultaneousNotes;
@ -107,8 +107,8 @@ GLOBAL_ASM("asm/non_matchings/audio/heap/func_800B8EA8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BEF2C(? *); // extern
extern ? D_803B1510;
void func_800BEF2C(? *); // extern
extern u32 D_803B1510;
extern ? D_803B1A30;
void func_800B8F8C(s32 arg0) {
@ -216,7 +216,7 @@ UNUSED void func_800B90E0(struct struct_800B90E0 *arg0) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800B907C(? *, ? *, s32, s32); // extern
void func_800B907C(? *, ? *, s32, s32); // extern
extern s32 D_800EA5D0;
extern ? D_803AFBC8;
extern ? D_803AFBD8;
@ -237,7 +237,7 @@ GLOBAL_ASM("asm/non_matchings/audio/heap/func_800B90F0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 soundAlloc(? *, s32); // extern
? func_800B907C(? *, s32, s32); // extern
void func_800B907C(? *, s32, s32); // extern
extern ? D_803AFBC8;
extern ? gNotesAndBuffersPool;
extern ? D_803AFC18;
@ -254,7 +254,7 @@ GLOBAL_ASM("asm/non_matchings/audio/heap/func_800B914C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 soundAlloc(? *, s32); // extern
? func_800B907C(? *, s32, s32); // extern
void func_800B907C(? *, s32, s32); // extern
extern ? D_803AFC18;
extern ? D_803AFC28;
extern ? D_803AFC38;
@ -271,14 +271,14 @@ GLOBAL_ASM("asm/non_matchings/audio/heap/func_800B91C8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 soundAlloc(? *, s32); // extern
? func_800B907C(? *, s32, s32); // extern
? func_800B909C(? *); // extern
void func_800B907C(? *, s32, s32); // extern
void func_800B909C(? *); // extern
extern ? D_803AFC28;
extern ? D_803AFC48;
extern u32 D_803AFC48;
extern ? D_803AFC4C;
extern ? D_803AFE18;
extern u32 D_803AFE18;
extern ? D_803AFE1C;
extern ? D_803AFFE8;
extern u32 D_803AFFE8;
extern ? D_803AFFEC;
void func_800B9244(void *arg0) {
@ -297,8 +297,8 @@ GLOBAL_ASM("asm/non_matchings/audio/heap/func_800B9244.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 soundAlloc(? *, s32); // extern
? func_800B907C(? *, s32, s32); // extern
? func_800B90B0(? *); // extern
void func_800B907C(? *, s32, s32); // extern
void func_800B90B0(? *); // extern
extern ? D_803AFC38;
extern ? D_803AFDDC;
extern ? D_803AFDE0;
@ -322,17 +322,17 @@ GLOBAL_ASM("asm/non_matchings/audio/heap/func_800B9300.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800B8EA8(s16, s32, s16, s32 *); // extern
? func_800B8F8C(s16, s32); // extern
void func_800B8EA8(s16, s32, s16, s32 *); // extern
void func_800B8F8C(s16, s32); // extern
s32 soundAlloc(s32, s32); // extern
extern ? D_803AFC48;
extern ? D_803AFE18;
extern ? D_803AFFE8;
extern ? D_803B0380;
extern ? D_803B03C0;
extern u32 D_803AFC48;
extern u32 D_803AFE18;
extern u32 D_803AFFE8;
extern u8 D_803B0380;
extern u8 D_803B03C0;
extern ? D_803B0400;
extern void *D_803B1508;
extern ? D_803B1510;
extern u32 D_803B1510;
extern ? D_803B1A30;
extern s32 gMaxSimultaneousNotes;
@ -757,7 +757,7 @@ GLOBAL_ASM("asm/non_matchings/audio/heap/func_800B93BC.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800B9AD8(s32, s32, s32); // extern
u32 func_800B9AD8(s32, s32, s32); // extern
s32 func_800BA858(s32); // extern
void func_800B9A90(s32 arg0, s32 arg1, s32 arg2) {
@ -912,10 +912,10 @@ GLOBAL_ASM("asm/non_matchings/audio/heap/func_800B9FB8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800B9FB8(); /* extern */
? func_800BA250(); /* extern */
? func_800BEF2C(? *); /* extern */
extern ? D_803B1510;
void func_800B9FB8(); /* extern */
void func_800BA250(); /* extern */
void func_800BEF2C(? *); /* extern */
extern u32 D_803B1510;
extern ? D_803B1A30;
extern ? gAudioBufferParameters;
@ -1028,15 +1028,15 @@ GLOBAL_ASM("asm/non_matchings/audio/heap/func_800BA00C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800B8DE0(); // extern
void func_800B8DE0(); // extern
s32 soundAlloc(? *, s32); // extern
? func_800B914C(? *, s16, s16, u16); // extern
? func_800B91C8(? *); // extern
? func_800B9244(? *); // extern
? func_800B9300(? *); // extern
? func_800BB030(s32); // extern
? func_800BD368(); // extern
? func_800BDD34(); // extern
void func_800B914C(? *, s16, s16, u16); // extern
void func_800B91C8(? *); // extern
void func_800B9244(? *); // extern
void func_800B9300(? *); // extern
void func_800BB030(s32); // extern
void func_800BD368(); // extern
void func_800BDD34(); // extern
extern ? D_800EA4D8;
extern s16 D_800EA5CC;
extern f32 D_800F2E98;
@ -1060,7 +1060,7 @@ extern s32 D_803B70AC;
extern s32 gMaxSimultaneousNotes;
extern s16 D_803B70B4;
extern ? D_803B70C8;
extern ? D_803B70D0;
extern s32 D_803B70D0;
extern f32 D_803B7178;
extern s32 D_803B717C;

View File

@ -94,7 +94,7 @@ void func_800BAAF8(uintptr_t devAddr, void *vAddr, size_t nbytes, OSMesgQueue *q
//#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
//? osPiStartDma(s32, ?, ?, s32, void *, u32, s32); // extern
//s32 osPiStartDma(s32, ?, ?, s32, void *, u32, s32); // extern
/**
@ -231,14 +231,14 @@ void *func_800BAD0C(uintptr_t devAddr, u32 size, s32 arg2, u8 *dmaIndexRef) {
}
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? osPiStartDma(void *, ?, ?, s32, s32, s32, ? *); // extern
extern ? gCurrAudioFrameDmaQueue;
extern ? gCurrAudioFrameDmaIoMesgBufs;
s32 osPiStartDma(void *, ?, ?, s32, s32, s32, ? *); // extern
extern OSMesgQueue gCurrAudioFrameDmaQueue;
extern OSIoMesg gCurrAudioFrameDmaIoMesgBufs;
extern ? sSampleDmas;
extern u32 gSampleDmaNumListItems;
extern u32 sSampleDmaListSize1;
extern ? sSampleDmaReuseQueue1;
extern ? sSampleDmaReuseQueue2;
extern u8 sSampleDmaReuseQueue1;
extern u8 sSampleDmaReuseQueue2;
extern u8 sSampleDmaReuseQueueTail1;
extern u8 sSampleDmaReuseQueueTail2;
extern u8 sSampleDmaReuseQueueHead2;
@ -476,7 +476,7 @@ s32 func_800BB304(struct AudioBankSample *sample) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BB304(s32); // extern
s32 func_800BB304(s32); // extern
void *func_800BC948(); // extern
void *func_800BC9F8(?); // extern
@ -550,7 +550,7 @@ GLOBAL_ASM("asm/non_matchings/audio/load/func_800BB43C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 soundAlloc(? *, s32, s32); // extern
? audio_dma_copy_immediate(s32, s32, s32, s32); // extern
void audio_dma_copy_immediate(s32, s32, s32, s32); // extern
extern ? gNotesAndBuffersPool;
void func_800BB484(void **arg0, s32 arg1, s32 arg2) {
@ -602,7 +602,7 @@ GLOBAL_ASM("asm/non_matchings/audio/load/func_800BB484.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BB624(s32, s32, u8, u8); // extern
void func_800BB624(s32, s32, u8, u8); // extern
extern s32 D_803B7074;
extern s32 D_803B7080;
@ -635,7 +635,7 @@ GLOBAL_ASM("asm/non_matchings/audio/load/func_800BB584.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BB484(void *, void **, ?); // extern
void func_800BB484(void *, void **, ?); // extern
void func_800BB624(void **arg0, ? arg1, s32 arg2, s32 arg3) {
s32 temp_s2;
@ -703,10 +703,10 @@ GLOBAL_ASM("asm/non_matchings/audio/load/func_800BB624.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800B93BC(? *, ?, s32, ?, s32); // extern
? audio_dma_copy_immediate(s32, s32, s32); // extern
? func_800BB584(s32); // extern
extern ? D_803AFE18;
extern ? D_803B03C0;
void audio_dma_copy_immediate(s32, s32, s32); // extern
void func_800BB584(s32); // extern
extern u32 D_803AFE18;
extern u8 D_803B03C0;
extern s32 D_803B7070;
extern s32 D_803B7080;
@ -744,9 +744,9 @@ GLOBAL_ASM("asm/non_matchings/audio/load/func_800BB780.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800B93BC(? *, ?, s32, ?, s32); // extern
? func_800BAB58(void *, void *, void *, OSMesgQueue *, void *); // extern
extern ? D_803AFE18;
extern ? D_803B03C0;
void func_800BAB58(void *, void *, void *, OSMesgQueue *, void *); // extern
extern u32 D_803AFE18;
extern u8 D_803B03C0;
extern s32 D_803B7070;
extern s32 D_803B7080;
@ -796,8 +796,8 @@ GLOBAL_ASM("asm/non_matchings/audio/load/func_800BB864.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800B93BC(? *, ?, s32, ?, s32); // extern
? audio_dma_copy_immediate(s32, s32, s32); // extern
extern ? D_803AFC48;
void audio_dma_copy_immediate(s32, s32, s32); // extern
extern u32 D_803AFC48;
extern ? D_803B0400;
extern s32 D_803B706C;
@ -833,9 +833,9 @@ GLOBAL_ASM("asm/non_matchings/audio/load/func_800BB99C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800B93BC(? *, ?, s32, ?, s32); // extern
? audio_dma_copy_immediate(s32, s32, s32); // extern
? func_800BAAF8(s32, s32, s32, OSMesgQueue *, void *); // extern
extern ? D_803AFC48;
void audio_dma_copy_immediate(s32, s32, s32); // extern
void func_800BAAF8(s32, s32, s32, OSMesgQueue *, void *); // extern
extern u32 D_803AFC48;
extern ? D_803B0400;
extern s32 D_803B706C;
@ -885,7 +885,7 @@ GLOBAL_ASM("asm/non_matchings/audio/load/func_800BBA50.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800B9A90(s32, ?, u8); // extern
extern ? D_803B03C0;
extern u8 D_803B03C0;
extern s32 D_803B7078;
s32 func_800BBBA0(s32 arg0, s32 *arg1, s32 *arg2) {
@ -938,7 +938,7 @@ GLOBAL_ASM("asm/non_matchings/audio/load/func_800BBBA0.s")
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800B9A90(s32, ?, u8); // extern
s32 func_800BB780(u8, ?); // extern
extern ? D_803B03C0;
extern u8 D_803B03C0;
extern s32 D_803B7078;
s32 func_800BBCD0(s32 arg0, s8 *arg1) {
@ -988,9 +988,9 @@ GLOBAL_ASM("asm/non_matchings/audio/load/func_800BBCD0.s")
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800B9A90(?, ?, u32); // extern
s32 func_800BB99C(u32, ?, u32); // extern
? func_800BBCD0(u32, ? *, u32); // extern
s32 func_800BBCD0(u32, ? *, u32); // extern
extern s32 D_800EA5DC;
extern ? D_803B03C0;
extern u8 D_803B03C0;
extern s32 D_803B706C;
extern u16 D_803B707C;
@ -1064,9 +1064,9 @@ s32 func_800BB99C(s8, ?); // extern
s32 func_800BBA50(s8, ?, void *); // extern
s32 func_800BBBA0(s8, s32 *, s32 *); // extern
s32 func_800BBCD0(s8, void *, s32 *); // extern
? func_800BEF2C(void *); // extern
? func_800C11B0(s32); // extern
extern ? D_803B1510;
void func_800BEF2C(void *); // extern
void func_800C11B0(s32); // extern
extern u32 D_803B1510;
extern s32 D_803B706C;
extern u16 D_803B707C;

View File

@ -6,10 +6,10 @@
extern f32 D_800F2EB0;
extern f32 D_800F2EB4;
extern s8 D_803B70B6;
extern ? gDefaultPanVolume;
extern ? gHeadsetPanQuantization;
extern ? gHeadsetPanVolume;
extern ? gStereoPanVolume;
extern f32 gDefaultPanVolume;
extern u16 gHeadsetPanQuantization;
extern f32 gHeadsetPanVolume;
extern f32 gStereoPanVolume;
void func_800BC5D0(void *arg0, f32 arg1, s32 arg2, u8 arg3) {
f32 temp_f14;
@ -161,7 +161,7 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BC90C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_803B03C0;
extern u8 D_803B03C0;
extern s32 D_803B7080;
extern s32 D_803B7198;
@ -191,7 +191,7 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BC948.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_803B03C0;
extern u8 D_803B03C0;
extern s32 D_803B7080;
extern s32 D_803B7198;
@ -225,8 +225,8 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BC9F8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BE5BC(void *, s32, void *, void *); // extern
extern ? gDefaultNoteSub;
void func_800BE5BC(void *, s32, void *, void *); // extern
extern NoteSub gDefaultNoteSub;
void func_800BCAB4(void *arg0) {
s32 temp_a1;
@ -259,7 +259,7 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BCAB4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BC5D0(?, ?, ?); // extern
void func_800BC5D0(?, ?, ?); // extern
void func_800BCB48(void *arg0) {
if (((arg0->unkB0 * 2) >> 0x1F) == 1) {
@ -279,18 +279,18 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BCB48.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BC5D0(void *, f32, u8, u8); // extern
? func_800BC840(void *, f32, u8, u8); // extern
? func_800BCB48(void *, void *); // extern
? func_800BD140(u32, u32); // extern
? func_800BD6B4(s32, void *); // extern
? func_800BD6F4(void *); // extern
? func_800BD7C0(void *, void *); // extern
? func_800BE468(void *); // extern
? func_800BE4D4(void *); // extern
void func_800BC5D0(void *, f32, u8, u8); // extern
void func_800BC840(void *, f32, u8, u8); // extern
void func_800BCB48(void *, void *); // extern
void func_800BD140(u32, u32); // extern
void func_800BD6B4(s32, void *); // extern
void func_800BD6F4(void *); // extern
void func_800BD7C0(void *, void *); // extern
void func_800BE468(void *); // extern
void func_800BE4D4(void *); // extern
f32 func_800BE5E0(void *); // extern
? func_800BEBA4(void *, u32); // extern
? func_800BF004(s32, void *); // extern
void func_800BEBA4(void *, u32); // extern
void func_800BF004(s32, void *); // extern
extern s32 D_803B1508;
extern s32 gMaxSimultaneousNotes;
@ -452,8 +452,8 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BCBC4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BD6B4(s32, void *); // extern
? func_800BD6F4(void *, void *, s32, s32); // extern
void func_800BD6B4(s32, void *); // extern
void func_800BD6F4(void *, void *, s32, s32); // extern
extern f32 D_803B70A0;
extern f32 D_803B70A4;
@ -538,7 +538,7 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BCF44.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BCF44(?); // extern
void func_800BCF44(?); // extern
void func_800BD120(void) {
func_800BCF44(6);
@ -549,7 +549,7 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BD120.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BCF44(?); // extern
void func_800BCF44(?); // extern
void func_800BD140(void) {
func_800BCF44(7);
@ -564,7 +564,7 @@ extern f32 D_800F2EC4;
extern f32 D_800F2EC8;
extern f32 D_800F2ECC;
extern f32 D_800F2ED0;
extern ? gUnknownWave7;
extern s16 gUnknownWave7;
s8 func_800BD160(void *arg0, void *arg1, s32 arg2) {
f32 temp_f12;
@ -648,7 +648,7 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BD308.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BD308(s32); // extern
void func_800BD308(s32); // extern
void func_800BD318(void *arg0) {
func_800BD308();
@ -666,8 +666,8 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BD318.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BD318(? *); // extern
? func_800BF004(? *, s32); // extern
void func_800BD318(? *); // extern
void func_800BF004(? *, s32); // extern
extern s32 D_803B1508;
extern ? D_803B5FC8;
extern s32 gMaxSimultaneousNotes;
@ -699,8 +699,8 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BD368.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BD6F4(s32, ? *, ? *); // extern
? func_800BF004(? *, s32); // extern
void func_800BD6F4(s32, ? *, ? *); // extern
void func_800BF004(? *, s32); // extern
extern ? D_803B5FC8;
extern ? D_803B5FD8;
extern ? D_803B5FE8;
@ -794,8 +794,8 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BD418.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BD418(); // extern
? func_800BF004(s32, s32); // extern
void func_800BD418(); // extern
void func_800BF004(s32, s32); // extern
s32 func_800BF044(? *); // extern
extern ? D_803B5FC8;
extern ? D_803B5FD8;
@ -908,7 +908,7 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BD6F4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BD6F4(void *, void *); // extern
void func_800BD6F4(void *, void *); // extern
void *func_800BD720(void *arg0, s32 arg1) {
void *sp18;
@ -954,8 +954,8 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BD720.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BCAB4(); // extern
? func_800BD160(void *, void *, s32); // extern
void func_800BCAB4(); // extern
s32 func_800BD160(void *, void *, s32); // extern
void func_800BD7C0(void *arg0, void *arg1) {
void *sp1C;
@ -1005,7 +1005,7 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BD7C0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BD140(s32); // extern
void func_800BD140(s32); // extern
void func_800BD8F4(void *arg0, s32 arg1) {
func_800BD140(arg0->unk44);
@ -1031,8 +1031,8 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BD928.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BD6B4(s32, s32); // extern
? func_800BD7C0(s32, s32); // extern
void func_800BD6B4(s32, s32); // extern
void func_800BD7C0(s32, s32); // extern
s32 func_800BF044(); // extern
s32 func_800BD950(s32 arg0, s32 arg1) {
@ -1053,8 +1053,8 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BD950.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BD928(s32, s32); // extern
? func_800BF004(s32, s32); // extern
void func_800BD928(s32, s32); // extern
void func_800BF004(s32, s32); // extern
s32 func_800BF044(s32); // extern
s32 func_800BD99C(s32 arg0, s32 arg1) {
@ -1076,8 +1076,8 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BD99C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800BD720(s32, u8); // extern
? func_800BD8F4(s32, void *); // extern
? func_800BF004(s32, s32); // extern
void func_800BD8F4(s32, void *); // extern
void func_800BF004(s32, s32); // extern
s32 func_800BD9EC(s32 arg0, void *arg1) {
s32 sp1C;
@ -1097,12 +1097,12 @@ GLOBAL_ASM("asm/non_matchings/audio/playback/func_800BD9EC.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BD6F4(void *); // extern
? func_800BD928(void *, void *, void *); // extern
void func_800BD6F4(void *); // extern
void func_800BD928(void *, void *, void *); // extern
void *func_800BD950(? *, void *, void *); // extern
void *func_800BD99C(? *, void *, void *); // extern
void *func_800BD9EC(? *, void *, void *); // extern
? func_800BF004(s32, void *); // extern
void func_800BF004(s32, void *); // extern
extern ? D_803B5FC8;
void *func_800BDA44(void *arg0, void *arg2) {
@ -1190,7 +1190,7 @@ s32 soundAlloc(? *, ?); // extern
extern ? gNotesAndBuffersPool;
extern s32 D_803B1508;
extern s32 gMaxSimultaneousNotes;
extern ? gZeroNoteSub;
extern NoteSub gZeroNoteSub;
void func_800BDD34(void) {
s32 temp_s1;

View File

@ -5,8 +5,8 @@
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800B70EC(s32, s32 *, s32, s16); // extern
s32 func_800BA00C(); // extern
? func_800BAC04(); // extern
? func_800CBCB0(void *); // extern
void func_800BAC04(); // extern
void func_800CBCB0(void *); // extern
extern OSMesgQueue *D_800EA3A8;
extern OSMesgQueue *D_800EA3AC;
extern OSMesgQueue *D_800EA3B0;
@ -31,7 +31,7 @@ extern ? aspMainDataEnd;
extern ? aspMainDataStart;
extern ? aspMainTextStart;
extern ? rspbootTextEnd;
extern ? rspbootTextStart;
extern u64 rspbootTextStart;
void *create_next_audio_frame_task(void) {
u32 sp74;
@ -177,12 +177,12 @@ GLOBAL_ASM("asm/non_matchings/audio/port_eu/create_next_audio_frame_task.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BB388(u8, u8, u8, void *); // extern
? func_800BBDDC(u8, ?, void *); // extern
? func_800BBEF0(u8, u8, u8, void *); // extern
? func_800BEF2C(u32 *, s32, void *); // extern
? func_800CBA08(u8, s32, void *); // extern
? func_800CBA64(u8, s32); // extern
void func_800BB388(u8, u8, u8, void *); // extern
void func_800BBDDC(u8, ?, void *); // extern
void func_800BBEF0(u8, u8, u8, void *); // extern
void func_800BEF2C(u32 *, s32, void *); // extern
void func_800CBA08(u8, s32, void *); // extern
void func_800CBA64(u8, s32); // extern
extern u8 D_803B1510;
extern u8 D_803B1658;
extern u8 D_803B17A0;
@ -262,7 +262,7 @@ GLOBAL_ASM("asm/non_matchings/audio/port_eu/func_800CB818.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_803B1510;
extern u32 D_803B1510;
void func_800CBA08(s32 arg0, s16 arg1) {
? sp-10;
@ -284,7 +284,7 @@ GLOBAL_ASM("asm/non_matchings/audio/port_eu/func_800CBA08.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_803B1510;
extern u32 D_803B1510;
void func_800CBA64(s32 arg0, s16 arg1) {
? sp-10;
@ -347,7 +347,7 @@ GLOBAL_ASM("asm/non_matchings/audio/port_eu/func_800CBB48.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800CBB48(? *); // extern
void func_800CBB48(? *); // extern
void func_800CBB88(? arg1) {
func_800CBB48(&arg1);
@ -358,7 +358,7 @@ GLOBAL_ASM("asm/non_matchings/audio/port_eu/func_800CBB88.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800CBB48(? *); // extern
void func_800CBB48(? *); // extern
void func_800CBBB8(? arg1) {
func_800CBB48(&arg1);
@ -369,7 +369,7 @@ GLOBAL_ASM("asm/non_matchings/audio/port_eu/func_800CBBB8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800CBB48(s32 *); // extern
void func_800CBB48(s32 *); // extern
void func_800CBBE8(s32 arg1) {
s32 sp34;
@ -408,9 +408,9 @@ GLOBAL_ASM("asm/non_matchings/audio/port_eu/func_800CBC24.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800CB818(void *); /* extern */
void func_800CB818(void *); /* extern */
extern ? D_80193820;
extern ? D_803B1510;
extern u32 D_803B1510;
extern ? D_803B5EF0;
void func_800CBCB0(u32 arg0) {

View File

@ -3,7 +3,7 @@
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BD318(void *, void *, s32); // extern
void func_800BD318(void *, void *, s32); // extern
void func_800BE8F0(void *arg0) {
s32 temp_a0;
@ -75,7 +75,7 @@ GLOBAL_ASM("asm/non_matchings/audio/seqplayer/func_800BE8F0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BD120(s32, void *, s32); // extern
void func_800BD120(s32, void *, s32); // extern
s32 func_800BF044(? *, void *, s32); // extern
extern ? D_803B5FB8;
@ -143,7 +143,7 @@ GLOBAL_ASM("asm/non_matchings/audio/seqplayer/func_800BEA10.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BD120(); // extern
void func_800BD120(); // extern
void func_800BEB18(u8 *arg0) {
u8 temp_t0;
@ -163,8 +163,8 @@ GLOBAL_ASM("asm/non_matchings/audio/seqplayer/func_800BEB18.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BEB18(s32); // extern
? func_800BF004(? *, s32, s32); // extern
void func_800BEB18(s32); // extern
void func_800BF004(? *, s32, s32); // extern
extern ? D_803B5FB8;
void func_800BEB54(s32 arg0, s32 arg1) {
@ -189,8 +189,8 @@ GLOBAL_ASM("asm/non_matchings/audio/seqplayer/func_800BEB54.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BD418(s32); // extern
? func_800BEB54(u8 *, s32); // extern
void func_800BD418(s32); // extern
void func_800BEB54(u8 *, s32); // extern
void func_800BEBA4(u8 *arg0) {
s32 temp_s0;
@ -215,7 +215,7 @@ GLOBAL_ASM("asm/non_matchings/audio/seqplayer/func_800BEBA4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_803B1A30;
extern ? D_803B3EF0;
extern u8 D_803B3EF0;
extern ? D_803B5EF0;
? *func_800BEC10(void) {
@ -249,8 +249,8 @@ GLOBAL_ASM("asm/non_matchings/audio/seqplayer/func_800BEC10.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BE8F0(s32); // extern
? func_800BEBA4(s32, s32); // extern
void func_800BE8F0(s32); // extern
void func_800BEBA4(s32, s32); // extern
s32 func_800BEC10(); // extern
extern ? D_803B5EF0;
extern s32 D_803B7198;
@ -297,7 +297,7 @@ GLOBAL_ASM("asm/non_matchings/audio/seqplayer/func_800BEC8C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BEBA4(s32, s32); // extern
void func_800BEBA4(s32, s32); // extern
extern ? D_803B5EF0;
void func_800BEDB8(s32 arg0, s32 arg1) {
@ -332,7 +332,7 @@ GLOBAL_ASM("asm/non_matchings/audio/seqplayer/func_800BEDB8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BEB54(void *, s32); // extern
void func_800BEB54(void *, s32); // extern
extern ? D_803B5EF0;
void func_800BEE88(s32 arg0, s32 arg1, s32 arg2) {
@ -368,10 +368,10 @@ GLOBAL_ASM("asm/non_matchings/audio/seqplayer/func_800BEE88.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BD418(s32); // extern
? func_800BEDB8(?); // extern
extern ? D_803AFE18;
extern ? D_803B03C0;
void func_800BD418(s32); // extern
void func_800BEDB8(?); // extern
extern u32 D_803AFE18;
extern u8 D_803B03C0;
extern ? D_803B0400;
void func_800BEF2C(void *arg0) {
@ -447,8 +447,8 @@ GLOBAL_ASM("asm/non_matchings/audio/seqplayer/func_800BF044.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BF004(? *, ? *); // extern
extern ? D_803B3EF0;
void func_800BF004(? *, ? *); // extern
extern u8 D_803B3EF0;
extern ? D_803B3F5C;
extern ? D_803B5F5C;
extern ? D_803B5FB8;
@ -535,10 +535,10 @@ GLOBAL_ASM("asm/non_matchings/audio/seqplayer/func_800BF14C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800BD120(void *, s32); /* extern */
? func_800BD264(void *, void *); /* extern */
? func_800BE4D4(void *); /* extern */
? func_800BEB18(void *, s32); /* extern */
void func_800BD120(void *, s32); /* extern */
void func_800BD264(void *, void *); /* extern */
void func_800BE4D4(void *); /* extern */
void func_800BEB18(void *, s32); /* extern */
void func_800BF190(void *arg0) {
void *sp68;
@ -1082,14 +1082,14 @@ GLOBAL_ASM("asm/non_matchings/audio/seqplayer/func_800BFD6C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
s32 func_800B9A90(?, ?, u8, u16); /* extern */
? func_800BD418(void *); /* extern */
? func_800BD578(void *, s32); /* extern */
? func_800BEB54(void *, s32); /* extern */
? func_800BEBA4(void *); /* extern */
? func_800BEE88(s32 *, s32, s32); /* extern */
? func_800BF190(s32); /* extern */
? func_800BFCD8(void *, s32); /* extern */
? func_800BFD6C(void *, s32); /* extern */
void func_800BD418(void *); /* extern */
void func_800BD578(void *, s32); /* extern */
void func_800BEB54(void *, s32); /* extern */
void func_800BEBA4(void *); /* extern */
void func_800BEE88(s32 *, s32, s32); /* extern */
void func_800BF190(s32); /* extern */
void func_800BFCD8(void *, s32); /* extern */
void func_800BFD6C(void *, s32); /* extern */
void func_800BFD90(void *arg0) {
u8 sp55;
@ -1525,17 +1525,17 @@ GLOBAL_ASM("asm/non_matchings/audio/seqplayer/func_800BFD90.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_800BAB58(void *, void *, void *, void *, void *); /* extern */
? func_800BB584(u8, void *, void *); /* extern */
? func_800BD418(void *); /* extern */
? func_800BD578(void *, s8); /* extern */
? func_800BEC8C(void *, s32); /* extern */
? func_800BEDB8(void *, s32); /* extern */
? func_800BEE88(void *, s32, s32); /* extern */
? func_800BEF2C(void *, u8, s32); /* extern */
? func_800BFD90(s32); /* extern */
void func_800BAB58(void *, void *, void *, void *, void *); /* extern */
void func_800BB584(u8, void *, void *); /* extern */
void func_800BD418(void *); /* extern */
void func_800BD578(void *, s8); /* extern */
void func_800BEC8C(void *, s32); /* extern */
void func_800BEDB8(void *, s32); /* extern */
void func_800BEE88(void *, s32, s32); /* extern */
void func_800BEF2C(void *, u8, s32); /* extern */
void func_800BFD90(s32); /* extern */
s32 osRecvMesg(void *, ?, ?); /* extern */
extern ? D_803B03C0;
extern u8 D_803B03C0;
extern ? D_803B0400;
extern ? D_803B5EF0;
@ -1883,9 +1883,9 @@ GLOBAL_ASM("asm/non_matchings/audio/seqplayer/func_800C08CC.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BCBC4(); // extern
? func_800BDFF8(u32 *); // extern
? func_800C08CC(u32 *); // extern
void func_800BCBC4(); // extern
void func_800BDFF8(u32 *); // extern
void func_800C08CC(u32 *); // extern
extern u32 D_803B1510;
extern ? D_803B1A30;
@ -1910,10 +1910,10 @@ GLOBAL_ASM("asm/non_matchings/audio/seqplayer/func_800C1138.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BEF2C(void *); // extern
extern ? D_803B1510;
extern ? gDefaultShortNoteDurationTable;
extern ? gDefaultShortNoteVelocityTable;
void func_800BEF2C(void *); // extern
extern u32 D_803B1510;
extern u8 gDefaultShortNoteDurationTable;
extern u8 gDefaultShortNoteVelocityTable;
void func_800C11B0(s32 arg0) {
void *sp18;
@ -1944,10 +1944,10 @@ GLOBAL_ASM("asm/non_matchings/audio/seqplayer/func_800C11B0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800BD318(? *); // extern
? func_800BF084(s32, ? *, u32, u8 *); // extern
? func_800C11B0(s32); // extern
extern ? D_803B1510;
void func_800BD318(? *); // extern
void func_800BF084(s32, ? *, u32, u8 *); // extern
void func_800C11B0(s32); // extern
extern u32 D_803B1510;
extern ? D_803B15A4;
extern ? D_803B1A30;
extern u8 D_803B3EF0;

View File

@ -280,10 +280,10 @@ GLOBAL_ASM("asm/non_matchings/audio/synthesis/func_800B7034.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800B7034(s32); // extern
void func_800B7034(s32); // extern
void *func_800B775C(s32, s32, void *, s32); // extern
? func_800C1138(s32); // extern
? prepare_reverb_ring_buffer(s32, s32, s32); // extern
void func_800C1138(s32); // extern
void prepare_reverb_ring_buffer(s32, s32, s32); // extern
extern ? gAudioBufferParameters;
void *func_800B70EC(void *arg0, s32 *arg1, s32 arg2, s32 arg3) {
@ -551,7 +551,7 @@ Tried to use struct NoteSubEu before it is defined.
void *func_800B7304(void *, s32, s16, s16); // extern
void *func_800B7630(void *, s16, s16); // extern
void *func_800B7C30(u8, s32, s32, s32, s32, void *, s32); // extern
extern ? D_803B03C0;
extern u8 D_803B03C0;
extern s32 D_803B1508;
extern s32 gMaxSimultaneousNotes;
extern s32 D_803B7198;
@ -802,9 +802,9 @@ s32 func_800B8644(void *, void *, s32, u16, s32, s32); // extern
s32 func_800B86A0(s32, void *, void *, s32, s32, s32, s32); // extern
s32 func_800B8A2C(s32, void *, void *, s32, s32, s32); // extern
s32 func_800BAD0C(s32, s32, s32, void *); // extern
? synthesis_load_note_subs_eu(s32, s32, s32, s32); // extern
void synthesis_load_note_subs_eu(s32, s32, s32, s32); // extern
extern s32 D_803B1508;
extern ? gUnknownData_800F6290;
extern s32 gUnknownData_800F6290;
s32 func_800B7C30(s32 arg0, void *arg1, void *arg2, ? arg3, s32 arg4, void *arg5, s32 arg6) {
void *sp130;

View File

@ -12,14 +12,14 @@ Camera *camera4 = &cameras[3];
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
? func_80014DE4(s32, s32, s32, Camera *); /* extern */
extern ? D_80152300;
void func_80014DE4(s32, s32, s32, Camera *); /* extern */
extern u16 D_80152300;
extern ? D_80164498;
extern ? D_80164678;
extern s16 D_80164678;
extern ? D_801649D8;
extern ? D_801649E8;
extern ? D_801649F8;
extern ? D_80164A08;
extern s32 D_80164A08;
extern ? D_80164A18;
extern s32 D_80164A2C;
extern f32 D_80164A30;
@ -98,11 +98,10 @@ void func_8001C4D0(f32 posX, f32 posY, f32 posZ, s16 rot, u32 arg4, s32 cameraId
temp_v1 = &gPlayerOne[cameraId];
temp_a3->unk2C = (s16) temp_v1->unk_02E;
temp_a3->unk_AC = temp_v1->unk_02E;
temp_v0 = gActiveScreenMode;
switch (temp_v0) { /* switch 1; irregular */
case 0: /* switch 1 */
case 2: /* switch 1 */
if (gModeSelection == 3) {
switch (gActiveScreenMode) { /* switch 1; irregular */
case SCREEN_MODE_1P: /* switch 1 */
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL: /* switch 1 */
if (gModeSelection == BATTLE) {
temp_a3->unk_30[0] = 0.0f;
temp_a3->unk_3C[0] = 0.0f;
temp_a3->unk_3C[1] = 0.0f;
@ -119,8 +118,8 @@ void func_8001C4D0(f32 posX, f32 posY, f32 posZ, s16 rot, u32 arg4, s32 cameraId
temp_a3->unk_3C[2] = 70.0f;
}
break;
case 1: /* switch 1 */
if (gModeSelection == 3) {
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL: /* switch 1 */
if (gModeSelection == BATTLE) {
temp_a3->unk_30[0] = 0.0f;
temp_a3->unk_3C[0] = 0.0f;
temp_a3->unk_3C[1] = 0.0f;
@ -136,8 +135,8 @@ void func_8001C4D0(f32 posX, f32 posY, f32 posZ, s16 rot, u32 arg4, s32 cameraId
temp_a3->unk_30[2] = -35.0f;
}
break;
case 3: /* switch 1 */
if (gModeSelection == 3) {
case SCREEN_MODE_3P_4P_SPLITSCREEN: /* switch 1 */
if (gModeSelection == BATTLE) {
temp_a3->unk_30[0] = 0.0f;
temp_a3->unk_3C[0] = 0.0f;
temp_a3->unk_3C[1] = 0.0f;
@ -223,7 +222,7 @@ void func_8001CA24(Player *player, f32 arg1) {
#ifdef MIPS_TO_C
//generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9
? func_802B6540(f32 *, ?, f32, ?, s32); /* extern */
void func_802B6540(f32 *, ?, f32, ?, s32); /* extern */
extern f32 D_80164A30;
s16 gCurrentCourseId; /* unable to generate initializer */
@ -292,7 +291,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001CA78.s")
#ifdef MIPS_TO_C
//generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9
? func_802B6540(f32 *, ?, ?, ?, s32); /* extern */
void func_802B6540(f32 *, ?, ?, ?, s32); /* extern */
extern ? D_80164A38;
extern ? D_80164A48;
extern ? D_80164A78;
@ -412,8 +411,7 @@ void func_8001CCEC(Player *player, Camera *camera, f32 *arg2, f32 *arg3, f32 *ar
}
}
if ((player->unk_0CA & 0x100) == 0x100) {
temp_v0 = gActiveScreenMode;
if ((temp_v0 == 1) || (temp_v0 == 2) || (temp_v0 == 3)) {
if ((gActiveScreenMode == SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL) || (gActiveScreenMode == SCREEN_MODE_2P_SPLITSCREEN_VERTICAL) || (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN)) {
temp_a0_5 = var_s2 + &D_80164A90;
sp38 = temp_a0_5;
sp3C = var_v1_2;
@ -498,7 +496,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001CCEC.s")
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
? func_802B6540(f32 *, f32, ?, f32, s32); /* extern */
void func_802B6540(f32 *, f32, ?, f32, s32); /* extern */
extern ? D_80164A90;
extern ? D_80164AA0;
@ -555,7 +553,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001D53C.s")
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
? func_802B6540(f32 *, ?, f32, ?, s32); /* extern */
void func_802B6540(f32 *, ?, f32, ?, s32); /* extern */
void func_8001D794(Player *player, Camera *camera, f32 *arg2, f32 *arg3, f32 *arg4, f32 *arg5, s16 arg6) {
f32 sp6C;
@ -597,7 +595,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001D794.s")
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
? func_802B6540(f32 *, ?, ?, ?, s32); /* extern */
void func_802B6540(f32 *, ?, ?, ?, s32); /* extern */
extern ? D_80164A38;
extern ? D_80164A48;
extern ? D_80164A78;
@ -780,7 +778,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001D944.s")
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
? func_8001CA78(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, s32, s32); /* extern */
void func_8001CA78(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, s32, s32); /* extern */
void func_8001E0C4(Camera *camera, Player *player, s8 arg2) {
f32 sp84;
@ -854,7 +852,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001E0C4.s")
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
? func_8001CCEC(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, ? *, s32, s32); /* extern */
void func_8001CCEC(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, ? *, s32, s32); /* extern */
void func_8001E45C(Camera *camera, Player *player, s8 arg2) {
f32 sp94;
@ -955,7 +953,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001E45C.s")
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
? func_8001D53C(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, s32, s32); /* extern */
void func_8001D53C(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, s32, s32); /* extern */
void func_8001E8E8(Camera *camera, Player *player, s8 arg2) {
f32 sp8C;
@ -993,7 +991,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001E8E8.s")
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
? func_8001D944(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, ? *, s32, s32); /* extern */
void func_8001D944(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, ? *, s32, s32); /* extern */
void func_8001EA0C(Camera *camera, Player *player, s8 arg2) {
f32 sp94;
@ -1094,16 +1092,16 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001EA0C.s")
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
? func_80019ED0(); /* extern */
? func_8001A0A4(s16 *, Camera *, Player *, s8, s32); /* extern */
? func_8001A0DC(s16 *, Camera *, Player *, s8, s32); /* extern */
? func_8001A588(u16 *, Camera *, Player *, s8, s32); /* extern */
? func_8001E0C4(Camera *, Player *, s8); /* extern */
? func_8001E45C(Camera *, Player *, s8); /* extern */
? func_8001E8E8(Camera *, Player *, s8); /* extern */
? func_8001EA0C(Camera *, Player *, s8); /* extern */
? func_8001F87C(s32); /* extern */
extern ? D_80152300;
void func_80019ED0(); /* extern */
void func_8001A0A4(s16 *, Camera *, Player *, s8, s32); /* extern */
void func_8001A0DC(s16 *, Camera *, Player *, s8, s32); /* extern */
void func_8001A588(u16 *, Camera *, Player *, s8, s32); /* extern */
void func_8001E0C4(Camera *, Player *, s8); /* extern */
void func_8001E45C(Camera *, Player *, s8); /* extern */
void func_8001E8E8(Camera *, Player *, s8); /* extern */
void func_8001EA0C(Camera *, Player *, s8); /* extern */
void func_8001F87C(s32); /* extern */
extern u16 D_80152300;
extern u16 D_8015F894;
extern s8 D_80164A88;
extern s8 D_80164A89;
@ -1137,9 +1135,8 @@ void func_8001EE98(Player *player, Camera *camera, s8 arg2) {
if (camera == camera4) {
var_s0 = 3;
}
temp_v0 = gModeSelection;
switch (temp_v0) { /* irregular */
case 0:
switch (gModeSelection) { /* irregular */
case GRAND_PRIX:
if (((player->unk_000 & 0x800) == 0x800) || (D_800DC51C == 1)) {
*(&D_80152300 + (var_s0 * 2)) = 3;
} else if (D_800DC5FC == 1) {
@ -1148,7 +1145,7 @@ void func_8001EE98(Player *player, Camera *camera, s8 arg2) {
func_8001A0DC((var_s0 * 2) + &D_80152300, camera, player, arg2, var_s0);
}
break;
case 3:
case BATTLE:
if ((D_800DC51C == (u16) 1) || ((D_8015F894 == 2) && (D_80164A89 == 1))) {
if (D_80164A88 == 0) {
func_80019ED0();
@ -1172,7 +1169,7 @@ void func_8001EE98(Player *player, Camera *camera, s8 arg2) {
*sp2C = 9;
}
break;
case 1:
case TIME_TRIALS:
if (((gPlayerOne->unk_000 & 0x800) == 0x800) || (D_800DC51C == (u16) 1)) {
D_80152300.unk0 = 3;
*(&D_80152300 + 2) = 3;
@ -1191,7 +1188,7 @@ void func_8001EE98(Player *player, Camera *camera, s8 arg2) {
*sp2C = 1;
}
break;
case 2:
case VERSUS:
if (((player->unk_000 & 0x800) == 0x800) || (D_800DC51C == (u16) 1) || (D_8015F894 == 2)) {
*(&D_80152300 + (var_s0 * 2)) = 3;
} else {
@ -1246,7 +1243,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001EE98.s")
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
f32 func_80014EE4(f32, s32, s32); /* extern */
extern ? D_80164498;
extern ? D_80164A08;
extern s32 D_80164A08[4];
void func_8001F394(Player *player, f32 *arg1) {
s32 sp2C;
@ -1281,8 +1278,7 @@ void func_8001F394(Player *player, f32 *arg1) {
if (player == gPlayerFour) {
sp2C = 3;
}
temp_t3 = sp2C * 4;
temp_v1 = temp_t3 + &D_80164A08;
temp_v1 = D_80164A08[sp2C];
if (*temp_v1 == 0) {
if (player->unk_00C & 0x40000) {
*temp_v1 = 1;
@ -1384,12 +1380,11 @@ block_51:
}
break;
}
temp_v0_4 = gActiveScreenMode;
switch (temp_v0_4) { /* switch 1; irregular */
switch (gActiveScreenMode) { /* switch 1; irregular */
default: /* switch 1 */
var_f2 = sp34;
break;
case 0: /* switch 1 */
case SCREEN_MODE_1P: /* switch 1 */
temp_v0_5 = D_80164A28;
if (temp_v0_5 == 1) {
*(&D_80164498 + temp_t3) = 40.0f;
@ -1409,9 +1404,9 @@ block_51:
block_66:
var_f2 = var_f0;
break;
case 1: /* switch 1 */
case 2: /* switch 1 */
case 3: /* switch 1 */
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL: /* switch 1 */
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL: /* switch 1 */
case SCREEN_MODE_3P_4P_SPLITSCREEN: /* switch 1 */
var_f0 = func_80014EE4(*arg1, sp2C);
goto block_66;
}
@ -1424,7 +1419,7 @@ GLOBAL_ASM("asm/non_matchings/camera/func_8001F394.s")
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
extern ? D_80152300;
extern u16 D_80152300;
extern s32 D_80164A2C;
void func_8001F87C(s32 cameraId) {
@ -1433,10 +1428,10 @@ void func_8001F87C(s32 cameraId) {
s32 var_a1;
u16 temp_v0;
if (gActiveScreenMode == 0) {
if (gActiveScreenMode == SCREEN_MODE_1P) {
var_a1 = 0;
var_a2 = gPlayerOne;
if (gModeSelection == 0) {
if (gModeSelection == GRAND_PRIX) {
loop_3:
temp_v0 = var_a2->unk_000;
if (!(temp_v0 & 0x200) && !(temp_v0 & 0x80)) {

View File

@ -155,7 +155,7 @@ GLOBAL_ASM("asm/non_matchings/code_80004740/func_80004A1C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80004A1C(void *, s32, s32, s16); // extern
void func_80004A1C(void *, s32, s32, s16); // extern
extern ? D_80162D70;
extern s16 D_80162D76;
extern s16 D_80162D78;
@ -238,7 +238,7 @@ GLOBAL_ASM("asm/non_matchings/code_80004740/func_80004C30.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80004C30(s32, void *, s16); // extern
void func_80004C30(s32, void *, s16); // extern
s16 func_80004DFC(u32 arg0, u32 arg1, s16 arg2, s16 arg3) {
s32 sp24;

File diff suppressed because it is too large Load Diff

View File

@ -136,15 +136,15 @@ u16 func_8001FD78(Player *player, f32 posX, f32 arg2, f32 posZ) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8001F9E4(s8); /* extern */
extern ? D_80164AB0;
extern ? D_80164AC0;
extern ? D_80164AD0;
extern ? gFramebuffer0;
extern ? gFramebuffer1;
extern ? gFramebuffer2;
void func_8001F9E4(s8); /* extern */
extern s16 D_80164AB0;
extern s16 D_80164AC0;
extern s32 D_80164AD0;
extern u16 gFramebuffer0;
extern u16 gFramebuffer1;
extern u16 gFramebuffer2;
extern u16 sRenderingFramebuffer;
static ? D_800DDB50; /* unable to generate initializer */
static s8 D_800DDB50; /* unable to generate initializer */
static s32 D_800DDB58[4] = { 0, (s32) &gFramebuffer0, (s32) &gFramebuffer1, (s32) &gFramebuffer2 };
void func_80020000(Player *player, Camera *camera, u8 arg2, u8 arg3) {
@ -306,14 +306,14 @@ typedef struct {
/* 0x001 */ char pad1[0x91F]; /* maybe part of unk0[0x920]? */
} struct_D_802DFB80; /* size = 0x920 */
extern ? D_80164AAE;
extern s16 D_80164AAE;
extern s16 D_80164AB0;
extern ? D_80164ABE;
extern s16 D_80164ABE;
extern s16 D_80164AC0;
extern Player *D_80164AD0;
extern ? gFramebuffer0;
extern ? gFramebuffer1;
extern ? gFramebuffer2;
extern u16 gFramebuffer0;
extern u16 gFramebuffer1;
extern u16 gFramebuffer2;
static s32 D_800DDB58[4] = { 0, (s32) &gFramebuffer0, (s32) &gFramebuffer1, (s32) &gFramebuffer2 };
void func_8002088C(void) {
@ -339,7 +339,7 @@ void func_8002088C(void) {
func_8006E634(gPlayerTwo, 1, 1);
func_8006E634(gPlayerThree, 2, 1);
func_8006E634(gPlayerFour, 3, 1);
if (gActiveScreenMode != 3) {
if (gActiveScreenMode != SCREEN_MODE_3P_4P_SPLITSCREEN) {
func_8006E634(gPlayerFive, 4, 1);
func_8006E634(gPlayerSix, 5, 1);
func_8006E634(gPlayerSeven, 6, 1);
@ -379,14 +379,14 @@ typedef struct {
/* 0x001 */ char pad1[0x91F]; /* maybe part of unk0[0x920]? */
} struct_D_802DFB80; /* size = 0x920 */
extern ? D_80164AAE;
extern s16 D_80164AAE;
extern s16 D_80164AB0;
extern ? D_80164ABE;
extern s16 D_80164ABE;
extern s16 D_80164AC0;
extern Player *D_80164AD0;
extern ? gFramebuffer0;
extern ? gFramebuffer1;
extern ? gFramebuffer2;
extern u16 gFramebuffer0;
extern u16 gFramebuffer1;
extern u16 gFramebuffer2;
static s32 D_800DDB58[4] = { 0, (s32) &gFramebuffer0, (s32) &gFramebuffer1, (s32) &gFramebuffer2 };
void func_80020BF4(void) {
@ -446,14 +446,14 @@ typedef struct {
/* 0x001 */ char pad1[0x91F]; /* maybe part of unk0[0x920]? */
} struct_D_802DFB80; /* size = 0x920 */
extern ? D_80164AAE;
extern s16 D_80164AAE;
extern s16 D_80164AB0;
extern ? D_80164ABE;
extern s16 D_80164ABE;
extern s16 D_80164AC0;
extern Player *D_80164AD0;
extern ? gFramebuffer0;
extern ? gFramebuffer1;
extern ? gFramebuffer2;
extern u16 gFramebuffer0;
extern u16 gFramebuffer1;
extern u16 gFramebuffer2;
static s32 D_800DDB58[4] = { 0, (s32) &gFramebuffer0, (s32) &gFramebuffer1, (s32) &gFramebuffer2 };
void func_80020F1C(void) {
@ -518,10 +518,10 @@ void func_80021244(Player *player, s8 arg1, s8 arg2) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80020524(Player **, s8, s8); /* extern */
extern ? gFramebuffer0;
extern ? gFramebuffer1;
extern ? gFramebuffer2;
void func_80020524(Player **, s8, s8); /* extern */
extern u16 gFramebuffer0;
extern u16 gFramebuffer1;
extern u16 gFramebuffer2;
static ? *D_800DDB58[4] = { NULL, &gFramebuffer0, &gFramebuffer1, &gFramebuffer2 };
static ? D_800DDB68; /* unable to generate initializer */
static ? D_800DDB88; /* unable to generate initializer */
@ -551,7 +551,7 @@ void func_800212B4(void) {
func_80020000(gPlayerTwo, camera1, 1U, 0U);
func_80020000(gPlayerThree, camera1, 2U, 0U);
func_80020000(gPlayerFour, camera1, 3U, 0U);
if (gActiveScreenMode != 3) {
if (gActiveScreenMode != SCREEN_MODE_3P_4P_SPLITSCREEN) {
func_80020000(gPlayerFive, camera1, 4U, 0U);
func_80020000(gPlayerSix, camera1, 5U, 0U);
func_80020000(gPlayerSeven, camera1, 6U, 0U);
@ -561,7 +561,7 @@ void func_800212B4(void) {
func_80021244(gPlayerTwo, 1U, 0U);
func_80021244(gPlayerThree, 2U, 0U);
func_80021244(gPlayerFour, 3U, 0U);
if (gActiveScreenMode != 3) {
if (gActiveScreenMode != SCREEN_MODE_3P_4P_SPLITSCREEN) {
func_80021244(gPlayerFive, 4U, 0U);
func_80021244(gPlayerSix, 5U, 0U);
func_80021244(gPlayerSeven, 6U, 0U);
@ -574,7 +574,7 @@ void func_800212B4(void) {
func_8006E5AC(gPlayerTwo, 1, 0);
func_8006E5AC(gPlayerThree, 2, 0);
func_8006E5AC(gPlayerFour, 3, 0);
if (gActiveScreenMode != 3) {
if (gActiveScreenMode != SCREEN_MODE_3P_4P_SPLITSCREEN) {
func_8006E5AC(gPlayerFive, 4, 0);
func_8006E5AC(gPlayerSix, 5, 0);
func_8006E5AC(gPlayerSeven, 6, 0);
@ -672,7 +672,7 @@ void func_800219BC(void) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80024374(Player *, ?, ?); /* extern */
void func_80024374(Player *, ?, ?); /* extern */
extern s32 gGamestate;
void func_80021B0C(void) {
@ -685,7 +685,7 @@ void func_80021B0C(void) {
func_8006E7CC(gPlayerTwo, 1, 0);
func_8006E7CC(gPlayerThree, 2, 0);
func_8006E7CC(gPlayerFour, 3, 0);
if (gActiveScreenMode != 3) {
if (gActiveScreenMode != SCREEN_MODE_3P_4P_SPLITSCREEN) {
func_8006E7CC(gPlayerFive, 4, 0);
func_8006E7CC(gPlayerSix, 5, 0);
func_8006E7CC(gPlayerSeven, 6, 0);
@ -1401,13 +1401,13 @@ void func_80023C84(Player *player, s8 arg1, s8 arg2) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern ? D_0D008C78;
extern ? D_0D008D58;
extern ? D_80165C20;
extern Gfx D_0D008C78;
extern Gfx D_0D008D58;
extern s32 D_80165C20;
extern u32 D_8018D474;
static f32 D_800DDBD4[8] = { 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f };
static ? D_800DDE9C; /* unable to generate initializer */
static ? D_800E51D0; /* unable to generate initializer */
static Vtx D_800E51D0; /* unable to generate initializer */
static ? D_800E5210; /* unable to generate initializer */
void func_80024374(Player *player, s8 arg1, s8 arg2) {
@ -1582,17 +1582,17 @@ GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80024374.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern u8 D_0D008C78;
extern ? D_0D008CD8;
extern Gfx D_0D008CD8;
extern void *D_80164B04;
extern u8 *D_80164B08;
extern u8 *D_80164B0C;
extern ? D_80164B10;
extern ? D_80164B20;
extern ? D_80164B30;
extern ? D_80164B40;
extern ? D_80164B50;
extern ? D_80164B60;
extern ? D_8018D970;
extern u16 D_80164B10;
extern u16 D_80164B20;
extern u16 D_80164B30;
extern u16 D_80164B40;
extern u16 D_80164B50;
extern u16 D_80164B60;
extern s32 D_8018D970;
static ? D_800DDBB4; /* unable to generate initializer */
static f32 D_800DDBD4[8] = { 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f };
@ -2003,17 +2003,17 @@ GLOBAL_ASM("asm/non_matchings/code_8001F980/func_800248D0.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern ? D_0D008C78;
extern ? D_0D008CD8;
extern Gfx D_0D008C78;
extern Gfx D_0D008CD8;
extern void *D_80164B04;
extern u8 *D_80164B08;
extern u8 *D_80164B0C;
extern ? D_80164B10;
extern ? D_80164B20;
extern ? D_80164B30;
extern ? D_80164B40;
extern ? D_80164B50;
extern ? D_80164B60;
extern u16 D_80164B10;
extern u16 D_80164B20;
extern u16 D_80164B30;
extern u16 D_80164B40;
extern u16 D_80164B50;
extern u16 D_80164B60;
static ? *D_800DDBB4[8] = {
&D_800E49C0,
&D_800E4AC0,
@ -2025,7 +2025,7 @@ static ? *D_800DDBB4[8] = {
&D_800E50D0,
};
static f32 D_800DDBD4[8] = { 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f };
static ? D_800E49C0; /* unable to generate initializer */
static Vtx D_800E49C0; /* unable to generate initializer */
static ? D_800E4AC0; /* unable to generate initializer */
static ? D_800E4BC0; /* unable to generate initializer */
static ? D_800E4CC0; /* unable to generate initializer */
@ -2246,16 +2246,16 @@ GLOBAL_ASM("asm/non_matchings/code_8001F980/func_800256F4.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern ? D_0D008C78;
extern ? D_0D008D10;
extern Gfx D_0D008C78;
extern Gfx D_0D008D10;
extern u32 D_80164B08;
extern u32 D_80164B0C;
extern ? D_80164B10;
extern ? D_80164B20;
extern ? D_80164B30;
extern ? D_80164B40;
extern ? D_80164B50;
extern ? D_80164B60;
extern u16 D_80164B10;
extern u16 D_80164B20;
extern u16 D_80164B30;
extern u16 D_80164B40;
extern u16 D_80164B50;
extern u16 D_80164B60;
static ? *D_800DDBB4[8] = {
&D_800E49C0,
&D_800E4AC0,
@ -2267,7 +2267,7 @@ static ? *D_800DDBB4[8] = {
&D_800E50D0,
};
static f32 D_800DDBD4[8] = { 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f };
static ? D_800E49C0; /* unable to generate initializer */
static Vtx D_800E49C0; /* unable to generate initializer */
static ? D_800E4AC0; /* unable to generate initializer */
static ? D_800E4BC0; /* unable to generate initializer */
static ? D_800E4CC0; /* unable to generate initializer */
@ -2425,16 +2425,16 @@ GLOBAL_ASM("asm/non_matchings/code_8001F980/func_80025DE8.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern ? D_0D008C78;
extern ? D_0D008CD8;
extern Gfx D_0D008C78;
extern Gfx D_0D008CD8;
extern u32 D_80164B08;
extern u32 D_80164B0C;
extern ? D_80164B10;
extern ? D_80164B20;
extern ? D_80164B30;
extern ? D_80164B40;
extern ? D_80164B50;
extern ? D_80164B60;
extern u16 D_80164B10;
extern u16 D_80164B20;
extern u16 D_80164B30;
extern u16 D_80164B40;
extern u16 D_80164B50;
extern u16 D_80164B60;
static ? *D_800DDBB4[8] = {
&D_800E49C0,
&D_800E4AC0,
@ -2446,7 +2446,7 @@ static ? *D_800DDBB4[8] = {
&D_800E50D0,
};
static f32 D_800DDBD4[8] = { 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f };
static ? D_800E49C0; /* unable to generate initializer */
static Vtx D_800E49C0; /* unable to generate initializer */
static ? D_800E4AC0; /* unable to generate initializer */
static ? D_800E4BC0; /* unable to generate initializer */
static ? D_800E4CC0; /* unable to generate initializer */
@ -2607,13 +2607,13 @@ GLOBAL_ASM("asm/non_matchings/code_8001F980/func_800262E0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80023BF0(Player *, s8, s8, s8); // extern
? func_80023C84(Player *, s8, s8); // extern
? func_800248D0(Player *, s8, s8, s8); // extern
? func_800256F4(Player *, s8, s8, s8); // extern
? func_80025DE8(Player *, s8, s8, s8); // extern
? func_800262E0(Player *, s8, s8, s8); // extern
? func_80026B4C(s8, s8, s8); // extern
void func_80023BF0(Player *, s8, s8, s8); // extern
void func_80023C84(Player *, s8, s8); // extern
void func_800248D0(Player *, s8, s8, s8); // extern
void func_800256F4(Player *, s8, s8, s8); // extern
void func_80025DE8(Player *, s8, s8, s8); // extern
void func_800262E0(Player *, s8, s8, s8); // extern
void func_80026B4C(s8, s8, s8); // extern
extern OSMesgQueue gDmaMesgQueue;
extern ? D_801651D1;

View File

@ -41,8 +41,8 @@ s32 get_player_index_for_player(Player *player) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C94A4(s32, s8, u16 *); // extern
? func_800C9A88(s32, s8, u16 *); // extern
void func_800C94A4(s32, s8, u16 *); // extern
void func_800C9A88(s32, s8, u16 *); // extern
extern s32 D_8018D168;
void func_80027DA8(u16 *arg0, s8 arg1) {
@ -94,12 +94,12 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80027DA8.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_800C8F80(s32, ?, s8); /* extern */
? func_800C9018(s32, ?, s8); /* extern */
? func_800CA288(s32, ?, s8); /* extern */
? func_800CA2B8(s32, s8); /* extern */
? func_800CA2E4(s32, ?, s8); /* extern */
? func_800CA30C(s32, s8); /* extern */
void func_800C8F80(s32, ?, s8); /* extern */
void func_800C9018(s32, ?, s8); /* extern */
void func_800CA288(s32, ?, s8); /* extern */
void func_800CA2B8(s32, s8); /* extern */
void func_800CA2E4(s32, ?, s8); /* extern */
void func_800CA30C(s32, s8); /* extern */
s16 gCurrentCourseId; /* unable to generate initializer */
void func_80027EDC(u16 *arg0, s8 playerId) {
@ -498,11 +498,11 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80027EDC.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? control_cpu_movement(Player *, Camera *, s8, s8); /* extern */
? func_8002D028(s8); /* extern */
? func_8002E594(Player *, Camera *, s8, s8); /* extern */
? func_8002F730(Player *, Camera *, s8, s8); /* extern */
extern ? D_801633F8;
void control_cpu_movement(Player *, Camera *, s8, s8); /* extern */
void func_8002D028(s8); /* extern */
void func_8002E594(Player *, Camera *, s8, s8); /* extern */
void func_8002F730(Player *, Camera *, s8, s8); /* extern */
extern s16 D_801633F8;
void func_80028864(Player *player, Camera *camera, s8 arg2, s8 arg3) {
u16 sp1E;
@ -517,13 +517,12 @@ void func_80028864(Player *player, Camera *camera, s8 arg2, s8 arg3) {
temp_v0 = player->unk_000;
if (!(temp_v0 & 0x2000)) {
temp_v0_2 = gActiveScreenMode;
switch (temp_v0_2) { /* irregular */
case 0:
switch (gActiveScreenMode) { /* irregular */
case SCREEN_MODE_1P:
sp1E = func_8001FB0C(player, camera1, (f32) D_8016557C, 0.0f);
break;
case 1:
case 2:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
temp_v0_3 = func_8001FB0C(player, camera1, (f32) D_8016557C, 0.0f);
sp1E = temp_v0_3;
if (temp_v0_3 == 1) {
@ -532,7 +531,7 @@ void func_80028864(Player *player, Camera *camera, s8 arg2, s8 arg3) {
sp1E = func_8001FB0C(player, camera2, (f32) D_8016557C, 0.0f);
}
break;
case 3:
case SCREEN_MODE_3P_4P_SPLITSCREEN:
temp_v0_4 = func_8001FB0C(player, camera1, (f32) D_8016557C, 0.0f);
sp1E = temp_v0_4;
if (temp_v0_4 == 1) {
@ -554,7 +553,7 @@ void func_80028864(Player *player, Camera *camera, s8 arg2, s8 arg3) {
}
break;
}
if ((sp1E == 1) || ((player->unk_000 & 0x100) == 0x100) || (gModeSelection == 3) || (temp_v0_7 = player->unk_0CA, ((temp_v0_7 & 2) != 0)) || (temp_v0_7 & 8) || (*(&D_801633F8 + (arg2 * 2)) == (s16) 1U)) {
if ((sp1E == 1) || ((player->unk_000 & 0x100) == 0x100) || (gModeSelection == BATTLE) || (temp_v0_7 = player->unk_0CA, ((temp_v0_7 & 2) != 0)) || (temp_v0_7 & 8) || (*(&D_801633F8 + (arg2 * 2)) == (s16) 1U)) {
temp_t4 = player->unk_0BC & ~0x1000;
player->unk_0BC = temp_t4;
if (((temp_t4 & 0x80) == 0x80) || ((temp_t4 & 0x40) == 0x40) || ((temp_t4 & 0x400) == 0x400) || ((temp_t4 & 0x4000) == 0x4000) || ((temp_t4 & 0x80000) == 0x80000) || ((temp_t4 & 0x800000) == 0x800000) || ((temp_t4 & 0x01000000) == 0x01000000) || ((temp_t4 & 0x02000000) == 0x02000000) || ((temp_t4 & 0x20000) == 0x20000) || (player->unk_044 & 0x800)) {
@ -587,7 +586,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80028864.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8002E594(s8, s8); // extern
void func_8002E594(s8, s8); // extern
void func_80028C44(Player *arg0, s32 arg1, s8 arg2, s8 arg3) {
s32 temp_t9;
@ -610,7 +609,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80028C44.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8002E594(s8, s8); // extern
void func_8002E594(s8, s8); // extern
extern s32 D_800DC510;
void func_80028D3C(Player *arg0, s32 arg1, s8 arg2, s8 arg3) {
@ -636,11 +635,11 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80028D3C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80027DA8(s8); // extern
? func_80028864(void *, s32, s8, s8); // extern
? func_80028C44(void *, s32, s8, s8); // extern
? func_80028D3C(void *, s32, s8, s8); // extern
? func_80038C6C(s8, s8); // extern
void func_80027DA8(s8); // extern
void func_80028864(void *, s32, s8, s8); // extern
void func_80028C44(void *, s32, s8, s8); // extern
void func_80028D3C(void *, s32, s8, s8); // extern
void func_80038C6C(s8, s8); // extern
void func_80028E70(void *arg0, s32 arg1, s8 arg2, s8 arg3) {
s32 temp_v0_2;
@ -942,8 +941,8 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002934C.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_802AFA34(Player *, KartBoundingBoxCorner *, f32, f32, f32); /* extern */
? func_802B6540(f32, f32 (*)[3], ?, ?, ?, s32); /* extern */
s32 func_802AFA34(Player *, KartBoundingBoxCorner *, f32, f32, f32); /* extern */
void func_802B6540(f32, f32 (*)[3], ?, ?, ?, s32); /* extern */
static f32 D_800DDBD4[8] = { 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f, 0.75f };
void func_80029B4C(Player *player, f32 arg1, f32 arg2, f32 arg3) {
@ -1232,8 +1231,8 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002A5F4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C9060(u8, ?); // extern
? func_800C90F4(?, s32, void *); // extern
void func_800C9060(u8, ?); // extern
void func_800C90F4(?, s32, void *); // extern
void func_8002A704(void *arg0, u8 arg1) {
s32 temp_a1;
@ -1261,7 +1260,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002A704.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C9250(s32, s8, s32); // extern
void func_800C9250(s32, s8, s32); // extern
void func_8002A79C(void *arg0, s8 arg1) {
s32 temp_v0;
@ -1307,7 +1306,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002A79C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800C9060(s32, ?, s8); // extern
void func_800C9060(s32, ?, s8); // extern
void func_8002A8A4(void *arg0, s8 arg1) {
s16 temp_v0;
@ -1603,7 +1602,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002B218.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 90e635335cb052c4324a3aa7478e4761db19dfaf
? func_8002A704(Player *, s8); /* extern */
void func_8002A704(Player *, s8); /* extern */
void func_8002B308(Player *player, s8 arg1, s8 arg2) {
s32 temp_v0;
@ -1914,7 +1913,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002B9CC.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_802B6540(f32 (*)[3], ?, ?, ?, s32); /* extern */
void func_802B6540(f32 (*)[3], ?, ?, ?, s32); /* extern */
static ? D_800E3C98; /* unable to generate initializer */
void func_8002BB9C(Player *player, f32 *arg1, f32 *arg2, f32 *arg3) {
@ -2021,8 +2020,8 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002BD58.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_8001FD78(void *, s32, s32, s32); // extern
? func_800C9060(u8, ?, s32); // extern
? func_800C90F4(u8, s32, s32); // extern
void func_800C9060(u8, ?, s32); // extern
void func_800C90F4(u8, s32, s32); // extern
void func_8002BF4C(void *arg0, u8 arg1) {
s32 sp30;
@ -2107,7 +2106,7 @@ void func_8002C11C(Player *player) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern ? D_80165310;
extern ? D_80165320;
extern s16 D_80165320;
extern ? D_80165330;
s16 gCurrentCourseId; /* unable to generate initializer */
@ -2233,7 +2232,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002C17C.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8002C17C(Player *, s8); /* extern */
void func_8002C17C(Player *, s8); /* extern */
f32 func_802AAB4C(); /* extern */
s16 gCurrentCourseId; /* unable to generate initializer */
@ -2313,7 +2312,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002C4F8.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8002B9CC(s8, s8); /* extern */
void func_8002B9CC(s8, s8); /* extern */
void func_8002C7E4(Player *player, s8 arg1, s8 arg2) {
s16 temp_v1_2;
@ -2375,7 +2374,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002C7E4.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_800CAEC4(u8, f32); /* extern */
void func_800CAEC4(u8, f32); /* extern */
void func_8002C954(Player *player, s8 arg1, f32 *arg2) {
f32 *temp_v0_3;
@ -2446,12 +2445,12 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002C954.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8008C9EC(Player *, s8); /* extern */
? func_8008CEB0(Player *, s8); /* extern */
? func_8008D170(Player *, s8); /* extern */
? func_8008E118(Player *, s8); /* extern */
? func_80090970(Player *, s8, s8); /* extern */
? func_80091298(Player *, s8); /* extern */
void func_8008C9EC(Player *, s8); /* extern */
void func_8008CEB0(Player *, s8); /* extern */
void func_8008D170(Player *, s8); /* extern */
void func_8008E118(Player *, s8); /* extern */
void func_80090970(Player *, s8, s8); /* extern */
void func_80091298(Player *, s8); /* extern */
extern s32 D_800DC510;
void func_8002CD48(Player *player, s8 arg1, s8 arg2) {
@ -2534,7 +2533,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002CD48.s")
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
? func_8003680C(f32, Player *, s16, s16, s32); /* extern */
void func_8003680C(f32, Player *, s16, s16, s32); /* extern */
void func_8002D028(Player *player, s8 arg1) {
f32 sp54;
@ -2605,22 +2604,22 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002D028.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80027EDC(Player *, s8); /* extern */
? func_80029B4C(Player *, f32, f32, f32); /* extern */
? func_8002A194(Player *, f32, f32, f32); /* extern */
? func_8002A79C(Player *, s8); /* extern */
? func_8002AE38(Player *, s8, f32, f32, f32, f32); /* extern */
? func_8002BB9C(Player *, f32 *, f32 *, s8, s32, f32 *); /* extern */
? func_8002BF4C(Player *, s8); /* extern */
? func_8002C4F8(Player *, s8); /* extern */
? func_8002C7E4(f32, f32, Player *, s8, s8); /* extern */
? func_8002C954(Player *, s8, f32 *); /* extern */
? func_8002CD48(Player *, s8, s8); /* extern */
? func_8002FCA8(Player *, s8); /* extern */
void func_80027EDC(Player *, s8); /* extern */
void func_80029B4C(Player *, f32, f32, f32); /* extern */
void func_8002A194(Player *, f32, f32, f32); /* extern */
void func_8002A79C(Player *, s8); /* extern */
void func_8002AE38(Player *, s8, f32, f32, f32, f32); /* extern */
void func_8002BB9C(Player *, f32 *, f32 *, s8, s32, f32 *); /* extern */
void func_8002BF4C(Player *, s8); /* extern */
void func_8002C4F8(Player *, s8); /* extern */
void func_8002C7E4(f32, f32, Player *, s8, s8); /* extern */
void func_8002C954(Player *, s8, f32 *); /* extern */
void func_8002CD48(Player *, s8, s8); /* extern */
void func_8002FCA8(Player *, s8); /* extern */
f32 func_80030150(Player *, s8); /* extern */
? func_80037BB4(Player *, f32 *); /* extern */
? func_800CADD0(u8, f32); /* extern */
? func_802B6540(f32 *, f32, f32, f32, s32); /* extern */
void func_80037BB4(Player *, f32 *); /* extern */
void func_800CADD0(u8, f32); /* extern */
void func_802B6540(f32 *, f32, f32, f32, s32); /* extern */
static ? D_800E3CE8; /* unable to generate initializer */
static ? D_800E3CF4; /* unable to generate initializer */
static ? D_800E3D00; /* unable to generate initializer */
@ -2975,7 +2974,7 @@ void func_8002D268(Player *player, Camera *camera, s8 arg2, s8 arg3) {
func_8008F5A4(player, arg3);
}
player->unk_074 = func_802ABE30(spFC, spF8, spF4, player->unk_110.unk3A);
if (((player->unk_000 & 0x4000) == 0x4000) && ((temp_v0_16 = gActiveScreenMode, (temp_v0_16 == 0)) || (temp_v0_16 == 2) || (temp_v0_16 == 1))) {
if (((player->unk_000 & 0x4000) == 0x4000) && ((temp_v0_16 = gActiveScreenMode, (temp_v0_16 == SCREEN_MODE_1P)) || (temp_v0_16 == SCREEN_MODE_2P_SPLITSCREEN_VERTICAL) || (temp_v0_16 == SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL))) {
func_80029B4C(player, spFC, spF8, spF4);
} else {
func_8002A194(player, spFC, spF8, spF4);
@ -3051,17 +3050,17 @@ void func_8002E4C4(Player *player) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80029B4C(Player *, f32, f32, f32); /* extern */
? func_8002A194(Player *, f32, f32, f32); /* extern */
? func_8002AE38(Player *, s8, f32, f32, f32, f32); /* extern */
? func_8002C4F8(Player *, s8); /* extern */
? func_8002C7E4(Player *, s8, s8); /* extern */
? func_8002C954(Player *, s8, f32 *); /* extern */
? func_8002CD48(Player *, s8, s8); /* extern */
? func_8002FCA8(Player *, s8); /* extern */
void func_80029B4C(Player *, f32, f32, f32); /* extern */
void func_8002A194(Player *, f32, f32, f32); /* extern */
void func_8002AE38(Player *, s8, f32, f32, f32, f32); /* extern */
void func_8002C4F8(Player *, s8); /* extern */
void func_8002C7E4(Player *, s8, s8); /* extern */
void func_8002C954(Player *, s8, f32 *); /* extern */
void func_8002CD48(Player *, s8, s8); /* extern */
void func_8002FCA8(Player *, s8); /* extern */
f32 func_80030150(Player *, s8); /* extern */
? func_800CADD0(u8, f32); /* extern */
? func_802B6540(f32 *, f32, f32, f32, s32); /* extern */
void func_800CADD0(u8, f32); /* extern */
void func_802B6540(f32 *, f32, f32, f32, s32); /* extern */
static ? D_800E3D74; /* unable to generate initializer */
static ? D_800E3D80; /* unable to generate initializer */
static ? D_800E3D8C; /* unable to generate initializer */
@ -3327,7 +3326,7 @@ block_63:
func_8008F5A4(player, arg3);
}
player->unk_074 = func_802ABE30(spD0, spCC, spC8, player->unk_110.unk3A);
if (((player->unk_000 & 0x4000) == 0x4000) && ((temp_v0_11 = gActiveScreenMode, (temp_v0_11 == 0)) || (temp_v0_11 == 2) || (temp_v0_11 == 1))) {
if (((player->unk_000 & 0x4000) == 0x4000) && ((temp_v0_11 = gActiveScreenMode, (temp_v0_11 == SCREEN_MODE_1P)) || (temp_v0_11 == SCREEN_MODE_2P_SPLITSCREEN_VERTICAL) || (temp_v0_11 == SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL))) {
func_80029B4C(player, spD0, spCC, spC8);
} else {
func_8002A194(player, spD0, spCC, spC8);
@ -3370,9 +3369,9 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002E594.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8002CD48(Player *, s8, s8); /* extern */
void func_8002CD48(Player *, s8, s8); /* extern */
f32 func_80030150(Player *, s8); /* extern */
? func_802B6540(f32, f32, f32 *, f32, f32, f32, s32); /* extern */
void func_802B6540(f32, f32, f32 *, f32, f32, f32, s32); /* extern */
static ? D_800E3D98; /* unable to generate initializer */
static ? D_800E3DA4; /* unable to generate initializer */
static ? D_800E3DB0; /* unable to generate initializer */
@ -3493,12 +3492,12 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/control_cpu_movement.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80029B4C(Player *, f32, f32, f32); /* extern */
? func_8002A194(Player *, f32, f32, f32); /* extern */
? func_8002AE38(Player *, s8, f32, f32, f32, f32); /* extern */
void func_80029B4C(Player *, f32, f32, f32); /* extern */
void func_8002A194(Player *, f32, f32, f32); /* extern */
void func_8002AE38(Player *, s8, f32, f32, f32, f32); /* extern */
f32 func_80030150(Player *, s8); /* extern */
? func_80037BB4(? *); /* extern */
? func_802B6540(f32 *, f32, f32, f32, s32); /* extern */
void func_80037BB4(? *); /* extern */
void func_802B6540(f32 *, f32, f32, f32, s32); /* extern */
static ? D_800E3DC8; /* unable to generate initializer */
static ? D_800E3DD4; /* unable to generate initializer */
static ? D_800E3DE0; /* unable to generate initializer */
@ -3600,7 +3599,7 @@ void func_8002F730(Player *player, Camera *camera, s8 arg2, s8 arg3) {
func_8003F46C(player, &sp5C, &sp68, &spE8, &sp78, &spCC, &spC8, &spC4);
}
player->unk_074 = func_802ABE30(spCC, spC8, spC4, player->unk_110.unk3A);
if (((player->unk_000 & 0x4000) == 0x4000) && ((temp_v0 = gActiveScreenMode, (temp_v0 == 0)) || (temp_v0 == 2) || (temp_v0 == 1))) {
if (((player->unk_000 & 0x4000) == 0x4000) && ((temp_v0 = gActiveScreenMode, (temp_v0 == SCREEN_MODE_1P)) || (temp_v0 == SCREEN_MODE_2P_SPLITSCREEN_VERTICAL) || (temp_v0 == SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL))) {
func_80029B4C(player, spCC, spC8, spC4);
} else {
func_8002A194(player, spCC, spC8, spC4);
@ -3771,8 +3770,8 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8002FE84.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75
? func_8002FE84(f32, Player *, f32); /* extern */
? move_f32_towards(f32 *, f32, f32, Player *); /* extern */
void func_8002FE84(f32, Player *, f32); /* extern */
void move_f32_towards(f32 *, f32, f32, Player *); /* extern */
f32 func_80030150(Player *player, s8 arg1) {
f32 sp24;
@ -4609,7 +4608,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_8003221C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75
? func_80031F48(f32, f32, f32); /* extern */
void func_80031F48(f32, f32, f32); /* extern */
void func_800323E4(Player *player) {
s32 sp24;
@ -4700,7 +4699,6 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_800323E4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 get_player_index_for_player(); // extern
extern f64 D_800EDB10;
extern f64 D_800EDB18;
extern f64 D_800EDB20;
@ -4858,7 +4856,7 @@ void func_80032CB0(Player *player, f32 arg1) {
void func_80032D94(Player *player) {
f64 some_multiplier;
s32 player_index;
UNUSED s32 player_index;
player_index = get_player_index_for_player(player);
if ((0.0 <= player->unk_09C) && (player->unk_09C < (player->unk_214 * D_800EDBA8))) {
@ -5191,7 +5189,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_800339C4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80033850(s32); // extern
void func_80033850(s32); // extern
void func_80033A40(void *arg0, s32 *arg1, s32 *arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) {
s32 temp_at;
@ -5235,11 +5233,11 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80033A40.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75
? func_8002A8A4(f32, f32, Player *, s8); /* extern */
? func_8002BD58(Player *, s32); /* extern */
? func_80033884(Player *, s32 *, s32 *, s32, s32, s32, s32); /* extern */
? func_80033A40(Player *, s32 *, s32 *, s32, s32, s32, f32); /* extern */
? func_80036CB4(Player *); /* extern */
void func_8002A8A4(f32, f32, Player *, s8); /* extern */
void func_8002BD58(Player *, s32); /* extern */
void func_80033884(Player *, s32 *, s32 *, s32, s32, s32, s32); /* extern */
void func_80033A40(Player *, s32 *, s32 *, s32, s32, s32, f32); /* extern */
void func_80036CB4(Player *); /* extern */
s32 func_80038534(struct Controller *); /* extern */
static s32 D_800E3DF8[0x9C] = {
0,
@ -5552,7 +5550,7 @@ void func_80033AE0(Player *player, struct Controller *arg1, s8 arg2) {
player->unk_0FA = (s16) temp_t9;
if (((sp2D0 >= 0x5A) || (sp2D0 < -0x59)) && ((player->unk_044 & 0x4000) == 0)) {
temp_v1_4 = player->unk_0BC;
if (((temp_v1_4 & 0x10) == 0) && (gCCSelection == 2) && (gModeSelection != 3) && ((temp_v1_4 & 8) == 0) && (((player->unk_094 / 18.0f) * 216.0f) >= 40.0f) && (player->unk_204 == 0)) {
if (((temp_v1_4 & 0x10) == 0) && (gCCSelection == CC_150) && (gModeSelection != BATTLE) && ((temp_v1_4 & 8) == 0) && (((player->unk_094 / 18.0f) * 216.0f) >= 40.0f) && (player->unk_204 == 0)) {
player->unk_00C |= 0x80;
}
}
@ -5890,7 +5888,7 @@ block_125:
player->unk_078 = phi_t4;
}
}
if (gModeSelection == 3) {
if (gModeSelection == BATTLE) {
player->unk_078 = (s16) (s32) ((f64) player->unk_078 * 1.7);
}
}
@ -5900,8 +5898,8 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80033AE0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? move_s32_towards(f32, s32 *, s16, ?, void *); // extern
? func_80036CB4(f32, void *, s32); // extern
void move_s32_towards(f32, s32 *, s16, ?, void *); // extern
void func_80036CB4(f32, void *, s32); // extern
extern s32 D_800E4068;
extern ? D_800E4308;
extern f64 D_800EDD88;
@ -6063,7 +6061,7 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80036CB4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_802B63B8(f32, f32, void *, void *, void *); // extern
void func_802B63B8(f32, f32, void *, void *, void *); // extern
extern f64 D_800EDD90;
extern f64 D_800EDD98;
extern f64 D_800EDDA0;
@ -6377,8 +6375,8 @@ void func_80037A4C(Player *player, Vec3f arg1, Vec3f arg2) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80036DB4(f32 *, f32 *); /* extern */
? func_800371F4(f32 *, f32 *); /* extern */
void func_80036DB4(f32 *, f32 *); /* extern */
void func_800371F4(f32 *, f32 *); /* extern */
void func_80037BB4(Player *player, f32 *arg1) {
f32 sp20;
@ -6396,7 +6394,7 @@ void func_80037BB4(Player *player, f32 *arg1) {
player->unk_02E += temp_v0;
}
if (!(player->unk_000 & 0x1000)) {
if (gModeSelection == 3) {
if (gModeSelection == BATTLE) {
func_800378E8(player, &sp20, arg1);
return;
}
@ -6410,7 +6408,7 @@ void func_80037BB4(Player *player, f32 *arg1) {
player->unk_02E += temp_v0;
}
if (!(player->unk_000 & 0x1000)) {
if (gModeSelection == 3) {
if (gModeSelection == BATTLE) {
func_80037A4C(player, &sp20, arg1);
return;
}
@ -6425,14 +6423,14 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80037BB4.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80030C34(Player *); /* extern */
? func_80030E00(Player *); /* extern */
? func_80032050(Player *); /* extern */
? func_8003221C(Player *); /* extern */
? func_800323E4(Player *); /* extern */
? func_800332E8(Player *, s8); /* extern */
? func_800337CC(Player *, ?, s8); /* extern */
? func_80033AE0(Player *, struct Controller *, s8); /* extern */
void func_80030C34(Player *); /* extern */
void func_80030E00(Player *); /* extern */
void func_80032050(Player *); /* extern */
void func_8003221C(Player *); /* extern */
void func_800323E4(Player *); /* extern */
void func_800332E8(Player *, s8); /* extern */
void func_800337CC(Player *, ?, s8); /* extern */
void func_80033AE0(Player *, struct Controller *, s8); /* extern */
s32 func_800388B0(struct Controller *); /* extern */
void func_80037CFC(Player *player, struct Controller *controller, u8 arg2) {
@ -6491,7 +6489,7 @@ void func_80037CFC(Player *player, struct Controller *controller, u8 arg2) {
func_80030FC8(player);
func_80030E00(player);
} else {
if (gModeSelection == 3) {
if (gModeSelection == BATTLE) {
func_80031F48(player, 2.0f);
} else {
func_80031F48(player, 1.0f);
@ -6550,8 +6548,6 @@ GLOBAL_ASM("asm/non_matchings/code_80027D00/func_80037CFC.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80032700(s8); /* extern */
? func_80037CFC(s8); /* extern */
extern s8 D_80164A89;
extern s16 D_801656F0;
extern s32 D_8018D168;
@ -6597,66 +6593,42 @@ void func_800381AC(Player *player, struct Controller *controller, u8 arg2) {
GLOBAL_ASM("asm/non_matchings/code_80027D00/func_800381AC.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 90e635335cb052c4324a3aa7478e4761db19dfaf
? func_800381AC(Player *, s32, ?); /* extern */
extern s32 gControllerEight;
extern s32 gControllerFour;
extern s32 gControllerOne;
extern s32 gControllerSeven;
extern s32 gControllerSix;
extern s32 gControllerThree;
extern s32 gControllerTwo;
void func_800382DC(void) {
Player *temp_a0;
Player *temp_a0_2;
Player *temp_a0_3;
Player *temp_a0_4;
Player *temp_a0_5;
s32 temp_v0;
s32 temp_v0_2;
u16 temp_v0_3;
u16 temp_v0_4;
u16 temp_v0_5;
u16 temp_v0_6;
temp_v0 = gActiveScreenMode;
switch (temp_v0) { /* irregular */
case 0:
temp_v0_2 = gModeSelection;
switch (temp_v0_2) { /* switch 1; irregular */
switch (gActiveScreenMode) { /* irregular */
case SCREEN_MODE_1P:
switch (gModeSelection) { /* switch 1; irregular */
case 0: /* switch 1 */
func_800381AC(gPlayerOne, gControllerOne, 0);
return;
case 1: /* switch 1 */
if (D_8015F890 != 1) {
func_800381AC(gPlayerOne, gControllerOne, 0);
temp_a0 = gPlayerTwo;
temp_v0_3 = temp_a0->unk_000;
temp_v0_3 = gPlayerTwo->unk_000;
if (((temp_v0_3 & 0x100) == 0x100) && ((temp_v0_3 & 0x800) != 0x800)) {
func_800381AC(temp_a0, gControllerSix, 1);
func_800381AC(gPlayerTwo, gControllerSix, 1);
}
temp_a0_2 = gPlayerThree;
temp_v0_4 = temp_a0_2->unk_000;
temp_v0_4 = gPlayerThree->unk_000;
if (((temp_v0_4 & 0x100) == 0x100) && ((temp_v0_4 & 0x800) != 0x800)) {
func_800381AC(temp_a0_2, gControllerSeven, 2);
func_800381AC(gPlayerThree, gControllerSeven, 2);
return;
}
} else {
temp_a0_3 = gPlayerOne;
if ((temp_a0_3->unk_000 & 0x800) != 0x800) {
func_800381AC(temp_a0_3, gControllerEight, 0);
if ((gPlayerOne->unk_000 & 0x800) != 0x800) {
func_800381AC(gPlayerOne, gControllerEight, 0);
}
temp_a0_4 = gPlayerTwo;
temp_v0_5 = temp_a0_4->unk_000;
temp_v0_5 = gPlayerTwo->unk_000;
if (((temp_v0_5 & 0x100) == 0x100) && ((temp_v0_5 & 0x800) != 0x800)) {
func_800381AC(temp_a0_4, gControllerSix, 1);
func_800381AC(gPlayerTwo, gControllerSix, 1);
}
temp_a0_5 = gPlayerThree;
temp_v0_6 = temp_a0_5->unk_000;
temp_v0_6 = gPlayerThree->unk_000;
if (((temp_v0_6 & 0x100) == 0x100) && ((temp_v0_6 & 0x800) != 0x800)) {
func_800381AC(temp_a0_5, gControllerSeven, 2);
func_800381AC(gPlayerThree, gControllerSeven, 2);
return;
}
return;
@ -6664,12 +6636,12 @@ void func_800382DC(void) {
break;
}
break;
case 1:
case 2:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
func_800381AC(gPlayerOne, gControllerOne, 0);
func_800381AC(gPlayerTwo, gControllerTwo, 1);
return;
case 3:
case SCREEN_MODE_3P_4P_SPLITSCREEN:
func_800381AC(gPlayerOne, gControllerOne, 0);
func_800381AC(gPlayerTwo, gControllerTwo, 1);
func_800381AC(gPlayerThree, gControllerThree, 2);
@ -6679,9 +6651,6 @@ void func_800382DC(void) {
break;
}
}
#else
GLOBAL_ASM("asm/non_matchings/code_80027D00/func_800382DC.s")
#endif
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
@ -6821,12 +6790,12 @@ void func_80038BE4(Player *player, s16 arg1) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80029B4C(Player *, f32, f32, f32); /* extern */
? func_8002AE38(Player *, s8, f32, f32, f32, f32); /* extern */
? func_8002C4F8(Player *, s8); /* extern */
? func_8002C954(Player *, s8, f32 *); /* extern */
? func_8002CD48(Player *, s8, s8); /* extern */
? func_802B6540(f32 *, f32, f32, f32, s32); /* extern */
void func_80029B4C(Player *, f32, f32, f32); /* extern */
void func_8002AE38(Player *, s8, f32, f32, f32, f32); /* extern */
void func_8002C4F8(Player *, s8); /* extern */
void func_8002C954(Player *, s8, f32 *); /* extern */
void func_8002CD48(Player *, s8, s8); /* extern */
void func_802B6540(f32 *, f32, f32, f32, s32); /* extern */
static ? D_800E4328; /* unable to generate initializer */
static ? D_800E4334; /* unable to generate initializer */
static ? D_800E4340; /* unable to generate initializer */

View File

@ -116,4 +116,12 @@ extern f64 D_800EDC30;
extern f64 D_800EDC38;
extern f64 D_800EDC40;
extern struct Controller *gControllerEight;
extern struct Controller *gControllerFour;
extern struct Controller *gControllerOne;
extern struct Controller *gControllerSeven;
extern struct Controller *gControllerSix;
extern struct Controller *gControllerThree;
extern struct Controller *gControllerTwo;
#endif

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -74,14 +74,14 @@ extern s32 D_80183E4C;
extern s32 D_80183E5C;
extern s32 D_80183E6C;
extern s32 D_80183E7C;
extern ? D_8018C1B0;
extern ? D_8018C3B0;
extern ? D_8018C3F0;
extern s32 D_8018C1B0;
extern UnkActorInner D_8018C3B0;
extern s32 D_8018C3F0;
extern ? D_8018C5F0;
extern ? D_8018C630;
extern s32 D_8018C630;
extern ? D_8018C830;
extern ? D_8018C870;
extern ? D_8018C970;
extern s32 D_8018C870;
extern s32 D_8018C970;
extern s16 D_8018CF18;
extern s16 D_8018CF20;
extern s16 D_8018CF48;
@ -194,7 +194,7 @@ void func_8006ED60() {
extern OSMesgQueue gDmaMesgQueue;
extern void *gMainReceivedMesg;
extern OSIoMesg gDmaIoMesg;
extern ? _other_texturesSegmentRomStart;
extern s8 _other_texturesSegmentRomStart;
u8 *func_8006ED94(s32 arg0, u8 *arg1, u32 arg2, s32 arg3) {
void *sp28;
@ -272,26 +272,26 @@ static s32 D_800E54D0[0x14] = {
};
static s16 D_800E5520[0]; /* unable to generate initializer */
static s16 D_800E5548[0]; /* unable to generate initializer */
static ? gTextureCourseOutlineBansheeBoardwalk; /* unable to generate initializer */
static ? gTextureCourseOutlineBigDonut; /* unable to generate initializer */
static ? gTextureCourseOutlineBlockFort; /* unable to generate initializer */
static ? gTextureCourseOutlineBowsersCastle; /* unable to generate initializer */
static ? gTextureCourseOutlineChocoMountain; /* unable to generate initializer */
static ? gTextureCourseOutlineDksJungleParkway; /* unable to generate initializer */
static ? gTextureCourseOutlineDoubleDeck; /* unable to generate initializer */
static ? gTextureCourseOutlineFrappeSnowland; /* unable to generate initializer */
static ? gTextureCourseOutlineKalimariDesert; /* unable to generate initializer */
static ? gTextureCourseOutlineKoopaTroopaBeach; /* unable to generate initializer */
static ? gTextureCourseOutlineLuigiRaceway; /* unable to generate initializer */
static ? gTextureCourseOutlineMarioRaceway; /* unable to generate initializer */
static ? gTextureCourseOutlineMooMooFarm; /* unable to generate initializer */
static ? gTextureCourseOutlineRainbowRoad; /* unable to generate initializer */
static ? gTextureCourseOutlineRoyalRaceway; /* unable to generate initializer */
static ? gTextureCourseOutlineSherbetLand; /* unable to generate initializer */
static ? gTextureCourseOutlineSkyscraper; /* unable to generate initializer */
static ? gTextureCourseOutlineToadsTurnpike; /* unable to generate initializer */
static ? gTextureCourseOutlineWarioStadium; /* unable to generate initializer */
static ? gTextureCourseOutlineYoshiValley; /* unable to generate initializer */
static s32 gTextureCourseOutlineBansheeBoardwalk; /* unable to generate initializer */
static s32 gTextureCourseOutlineBigDonut; /* unable to generate initializer */
static s32 gTextureCourseOutlineBlockFort; /* unable to generate initializer */
static s32 gTextureCourseOutlineBowsersCastle; /* unable to generate initializer */
static s32 gTextureCourseOutlineChocoMountain; /* unable to generate initializer */
static s32 gTextureCourseOutlineDksJungleParkway; /* unable to generate initializer */
static s32 gTextureCourseOutlineDoubleDeck; /* unable to generate initializer */
static s32 gTextureCourseOutlineFrappeSnowland; /* unable to generate initializer */
static s32 gTextureCourseOutlineKalimariDesert; /* unable to generate initializer */
static s32 gTextureCourseOutlineKoopaTroopaBeach; /* unable to generate initializer */
static s32 gTextureCourseOutlineLuigiRaceway; /* unable to generate initializer */
static s32 gTextureCourseOutlineMarioRaceway; /* unable to generate initializer */
static s32 gTextureCourseOutlineMooMooFarm; /* unable to generate initializer */
static s32 gTextureCourseOutlineRainbowRoad; /* unable to generate initializer */
static s32 gTextureCourseOutlineRoyalRaceway; /* unable to generate initializer */
static s32 gTextureCourseOutlineSherbetLand; /* unable to generate initializer */
static s32 gTextureCourseOutlineSkyscraper; /* unable to generate initializer */
static s32 gTextureCourseOutlineToadsTurnpike; /* unable to generate initializer */
static s32 gTextureCourseOutlineWarioStadium; /* unable to generate initializer */
static s32 gTextureCourseOutlineYoshiValley; /* unable to generate initializer */
void func_8006EEE8(s32 courseId) {
s32 sp1C;
@ -390,8 +390,8 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_8006EF60.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8006EEE8(s16); /* extern */
extern ? D_0F0D0E50;
void func_8006EEE8(s16); /* extern */
extern s32 D_0F0D0E50;
extern s32 D_801655C8;
extern s16 D_80165718;
extern s16 D_80165720;
@ -615,14 +615,14 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_8006F008.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? play_sound2(?); // extern
void play_sound2(?); // extern
extern u16 D_800DC5FC;
extern s8 D_801657E4;
extern s8 D_801657E6;
extern s8 D_801657E8;
extern s8 D_801657F0;
extern s8 D_801657F8;
extern ? D_80165800;
extern s8 D_80165800;
extern s8 D_80165808;
extern s8 D_80165810;
extern s8 D_80165818;
@ -648,20 +648,20 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_8006F824.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8006F824(?, s8 *, s8 *, s32); // extern
void func_8006F824(?, s8 *, s8 *, s32); // extern
extern s8 D_801657E4;
extern s8 D_801657E6;
extern s8 D_801657E8;
extern s8 D_801657F0;
extern s8 D_801657F8;
extern ? D_80165800;
extern s8 D_80165800;
extern s8 D_80165808;
extern s8 D_80165810;
extern s8 D_80165818;
extern s8 D_80165820;
extern s8 D_80165828;
extern ? D_80165832;
extern ? D_8018D2D8;
extern s16 D_8018D2D8;
extern s8 D_8018EDFC;
void func_8006F8CC(void) {
@ -720,15 +720,15 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_8006F8CC.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8006F008(); // extern
? func_8006F8CC(); // extern
void func_8006F008(); // extern
void func_8006F8CC(); // extern
extern s32 D_801655D8;
extern s32 D_801655E8;
extern s32 D_801655F8;
extern s32 D_80165608;
extern s32 D_80165618;
extern s32 D_80165628;
extern ? D_80165658;
extern s32 D_80165658;
extern s16 D_801656F0;
extern s16 D_80165730;
extern s8 D_8016576A;
@ -761,7 +761,7 @@ extern ? D_8018CFAC;
extern ? D_8018CFB4;
extern ? D_8018CFBC;
extern ? D_8018CFC4;
extern ? D_8018D050;
extern f32 D_8018D050;
extern ? D_8018D0F0;
extern s32 D_8018D114;
extern s32 D_8018D160;
@ -793,7 +793,7 @@ extern s32 D_8018D2A4;
extern s32 D_8018D2AC;
extern s32 D_8018D2B4;
extern s32 D_8018D2BC;
extern ? D_8018D2C8;
extern s32 D_8018D2C8;
extern s16 D_8018D2F0;
extern s16 D_8018D2F8;
extern s32 D_8018D320;
@ -1079,7 +1079,7 @@ void func_80070190(void) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern ? D_0D005FB0;
extern Vtx D_0D005FB0;
extern s32 D_8018D220;
void func_80070250(s32 objectIndex, s32 arg1, void *arg2) {
@ -1111,7 +1111,7 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80070250.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80070250(s32, ?, void *); /* extern */
void func_80070250(s32, ?, void *); /* extern */
extern ? D_8018CC80;
extern s32 D_8018D1F0;
extern s32 D_8018D1F8;
@ -1141,7 +1141,7 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80070328.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern ? D_0D005770;
extern Vtx D_0D005770;
extern s32 D_0D0293D8;
void func_800703E0(s32 objectIndex, s32 arg1, void *arg2) {
@ -1170,7 +1170,7 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_800703E0.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_800703E0(s32, ?, void *); /* extern */
void func_800703E0(s32, ?, void *); /* extern */
extern ? D_8018CC80;
extern s32 D_8018D1F0;
extern s32 D_8018D1F8;
@ -1200,8 +1200,8 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_800704A0.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80070328(? *); /* extern */
? func_800704A0(? *); /* extern */
void func_80070328(? *); /* extern */
void func_800704A0(? *); /* extern */
extern ? D_8018CC80;
extern s32 D_8018D1F0;
extern s32 D_8018D1F8;
@ -1295,7 +1295,7 @@ void func_80070714(void) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_800770F0(s32); /* extern */
void func_800770F0(s32); /* extern */
extern s32 D_06007BB8;
extern s32 D_06007DB8;
extern s16 D_80165750;
@ -1318,11 +1318,11 @@ extern ? D_8018C6B0;
extern s32 D_8018CF10;
extern f32 D_8018D01C;
extern s8 D_8018D198;
extern ? D_8018D1A0;
extern s32 D_8018D1A0;
extern s8 D_8018D1A8;
extern ? D_8018D1B3;
extern s8 D_8018D1B8;
extern ? D_8018D1C4;
extern s32 D_8018D1C4;
extern s32 D_8018D1C8;
extern s32 D_8018D1D0;
extern s32 D_8018D1D8;
@ -1433,7 +1433,7 @@ void func_80070780(void) {
switch (temp_t6) {
case 0:
if (gGamestate != 9) {
if (gModeSelection == 0) {
if (gModeSelection == GRAND_PRIX) {
func_80070714();
}
var_s0 = &D_8018C630;
@ -1455,16 +1455,15 @@ void func_80070780(void) {
case 2:
D_80165750 = 0x000B;
D_80165758 = &D_800E5894;
temp_v0 = gCCSelection;
switch (temp_v0) { /* switch 1; irregular */
case 1: /* switch 1 */
case 3: /* switch 1 */
switch (gCCSelection) { /* switch 1; irregular */
case CC_100: /* switch 1 */
case CC_EXTRA: /* switch 1 */
break;
case 0: /* switch 1 */
case CC_50: /* switch 1 */
D_80165750 = 8;
D_80165758 = &D_800E5854;
break;
case 2: /* switch 1 */
case CC_150: /* switch 1 */
D_80165750 = 0x000C;
D_80165758 = &D_800E58EC;
break;
@ -1646,7 +1645,7 @@ void func_80070780(void) {
return;
case 7:
if (gGamestate != 9) {
if (gModeSelection == 0) {
if (gModeSelection == GRAND_PRIX) {
func_80070714();
}
var_s0_3 = &D_8018C630;
@ -1664,7 +1663,7 @@ void func_80070780(void) {
break;
case 8:
if (gGamestate != 9) {
if (gModeSelection == 0) {
if (gModeSelection == GRAND_PRIX) {
func_80070714();
}
D_80165898 = 0;
@ -1686,24 +1685,23 @@ void func_80070780(void) {
if (gGamestate != 9) {
temp_v0_10 = D_8018EDF3;
var_s1_8 = D_80183EA0;
if ((temp_v0_10 == 1) || ((temp_v0_10 == 2) && (gModeSelection == (s32) 2))) {
temp_v0_11 = gCCSelection;
switch (temp_v0_11) { /* switch 2; irregular */
case 0: /* switch 2 */
if ((temp_v0_10 == 1) || ((temp_v0_10 == 2) && (gModeSelection == (s32) VERSUS))) {
switch (gCCSelection) { /* switch 2; irregular */
case CC_50: /* switch 2 */
D_8018D1C8 = 4;
D_8018D1D0 = 6;
goto block_75;
case 1: /* switch 2 */
case CC_100: /* switch 2 */
D_8018D1C8 = 5;
D_8018D1D0 = 8;
D_8018D1D8 = 8;
break;
case 2: /* switch 2 */
case CC_150: /* switch 2 */
D_8018D1C8 = 5;
D_8018D1D0 = 8;
D_8018D1D8 = 0x0000000A;
break;
case 3: /* switch 2 */
case CC_EXTRA: /* switch 2 */
D_8018D1C8 = 5;
D_8018D1D0 = 8;
D_8018D1D8 = 8;
@ -1820,9 +1818,9 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80070780.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8006EE7C(s32); /* extern */
? func_8007055C(); /* extern */
? func_80070780(); /* extern */
void func_8006EE7C(s32); /* extern */
void func_8007055C(); /* extern */
void func_80070780(); /* extern */
extern s32 D_80165638;
extern s32 D_80165648;
extern s16 D_801656B0;
@ -1841,12 +1839,12 @@ extern f32 D_8018CFD4;
extern f32 D_8018CFEC;
extern f32 D_8018CFF4;
extern f32 D_8018D00C;
extern ? D_8018D028;
extern ? D_8018D050;
extern f32 D_8018D028;
extern f32 D_8018D050;
extern ? D_8018D078;
extern ? D_8018D098;
extern s16 D_8018D098;
extern ? D_8018D0A0;
extern ? D_8018D0C8;
extern f32 D_8018D0C8;
extern ? D_8018D0F0;
extern s32 D_8018D140;
extern s32 D_8018D150;
@ -1983,10 +1981,10 @@ void func_80071428(void) {
D_8018D3C0 = 0x00000050;
D_801657A2 = 0x0333;
switch (temp_v1) { /* irregular */
case 0:
case GRAND_PRIX:
D_8018D158 = 8;
return;
case 1:
case TIME_TRIALS:
D_80165638 = (func_800B4F2C(0, 40.0f, &D_8018D3DC, 1, 0x0078, 0x0028) & 0xFFFFF) - 1;
D_80165648 = func_800B4E24(0) & 0xFFFFF;
D_80165888 = 1;
@ -2001,9 +1999,9 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80071428.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8006EE7C(s32); /* extern */
? func_8007055C(); /* extern */
? func_80070780(); /* extern */
void func_8006EE7C(s32); /* extern */
void func_8007055C(); /* extern */
void func_80070780(); /* extern */
extern s16 D_801657A2;
extern s32 D_80183DA0;
extern s32 D_80183DB8;
@ -2067,14 +2065,14 @@ void func_80071818(void) {
D_8018D3C0 = 0x00000028;
D_801657A2 = 0x0666;
switch (temp_v1) { /* irregular */
case 0:
case GRAND_PRIX:
D_8018D158 = 8;
return;
case 2:
case VERSUS:
block_7:
D_8018D158 = 2;
return;
case 3:
case BATTLE:
goto block_7;
}
}
@ -2084,9 +2082,9 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80071818.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8006EE7C(s32, s16, s16, s16); /* extern */
? func_8007055C(); /* extern */
? func_80070780(); /* extern */
void func_8006EE7C(s32, s16, s16, s16); /* extern */
void func_8007055C(); /* extern */
void func_80070780(); /* extern */
extern s16 D_801657A2;
extern s32 D_80183DA0;
extern s32 D_80183DB8;
@ -2138,7 +2136,7 @@ void func_80071A20(void) {
D_8018CA70->unkDC = 0x007F;
D_8018CA70->unkDE = 0x0101;
D_8018CA70->unkE4 = 0x00DA;
if (gModeSelection == 3) {
if (gModeSelection == BATTLE) {
D_8018CA70->itemBoxY = 0x005E;
D_8018CA70->unkC8 = 0x00D0;
}
@ -2154,14 +2152,14 @@ void func_80071A20(void) {
D_8018D3C0 = 0x00000028;
D_801657A2 = 0x0666;
switch (temp_v0) { /* irregular */
case 0:
case GRAND_PRIX:
D_8018D158 = 8;
return;
case 2:
case VERSUS:
block_9:
D_8018D158 = 2;
return;
case 3:
case BATTLE:
goto block_9;
}
}
@ -2171,8 +2169,8 @@ GLOBAL_ASM("asm/non_matchings/code_8006E9C0/func_80071A20.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8006EE7C(s32, s16, s16, s16); /* extern */
? func_80070780(); /* extern */
void func_8006EE7C(s32, s16, s16, s16); /* extern */
void func_80070780(); /* extern */
extern s16 D_801657A2;
extern s32 D_80183DA0;
extern s32 D_80183DB8;
@ -2183,7 +2181,7 @@ extern s32 D_80183E88;
extern s32 D_80183E8C;
extern s32 D_80183E90;
extern s32 D_80183E94;
extern s32 D_8018D158;
extern s32 D_8018D158;find_unused_obj_index
extern s32 D_8018D3BC;
extern s32 D_8018D3C0;
extern s32 D_8018D3C4;
@ -2259,7 +2257,7 @@ void func_80071C28(void) {
D_8018CA70->unk1EC = 0x00D4;
D_8018CA70->unk1F8 = 0x00C8;
D_8018CA70->unk1FA = 0x00C0;
if (gModeSelection == 3) {
if (gModeSelection == BATTLE) {
D_8018CA70->itemBoxY = 0x00C8;
D_8018CA70->unkC8 = 0x00C8;
D_8018CA70->unk14C = 0x00B8;

File diff suppressed because it is too large Load Diff

View File

@ -404,10 +404,10 @@ UNUSED void func_800880DC(void) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_80165760;
extern ? D_80165770;
extern ? D_80165780;
extern ? D_80165784;
extern s16 D_80165760;
extern s16 D_80165770;
extern s16 D_80165780;
extern s16 D_80165784;
extern ? D_80165C94;
void func_800880E4(s32 arg0) {
@ -448,8 +448,8 @@ void func_80088150(s32 arg0) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern ? D_80165760;
extern ? D_80165780;
extern s16 D_80165760;
extern s16 D_80165780;
void func_80088178(s32 objectIndex, s32 arg1) {
s16 temp_a1;
@ -496,9 +496,9 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80088228.s")
extern s16 D_80165762;
extern s16 D_80165772;
extern s16 D_80165782;
extern ? D_80165C18;
extern struct_80165C18_entry D_80165C18;
? func_800882B0(s32 arg0, s32 arg1) {
s32 func_800882B0(s32 arg0, s32 arg1) {
f32 temp_f0;
f32 temp_f12;
f32 temp_f2;
@ -521,8 +521,8 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_800882B0.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_800880E4(); /* extern */
? func_80088178(s32, ?); /* extern */
void func_800880E4(); /* extern */
void func_80088178(s32, ?); /* extern */
s32 func_800882B0(s32, ?); /* extern */
void func_80088364(s32 objectIndex) {
@ -1000,10 +1000,10 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008933C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80072180(); // extern
void func_80072180(); // extern
s32 func_8007223C(?); // extern
f32 func_8008933C(Player *, s32, s32, s32); // extern
? func_800C9060(u8, s32); // extern
void func_800C9060(u8, s32); // extern
void func_80089474(s32 arg0, u8 arg1, s32 arg2, s32 arg3, s32 arg4) {
Player *sp18;
@ -1022,7 +1022,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089474.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80072180(); /* extern */
void func_80072180(); /* extern */
f32 func_8008933C(Player *, s32, s32, f32); /* extern */
extern s32 D_8018D158;
@ -1064,8 +1064,8 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089820.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80072180(); /* extern */
? func_8008933C(Player *, s32, s32, f32); /* extern */
void func_80072180(); /* extern */
f32 func_8008933C(Player *, s32, s32, f32); /* extern */
extern s32 D_8018D158;
void func_80089A04(s32 objectIndex, s32 arg1, f32 arg2) {
@ -1095,7 +1095,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089A04.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80072180(); /* extern */
void func_80072180(); /* extern */
extern s32 D_8018D158;
s32 func_80089B50(s32 objectIndex) {
@ -1140,7 +1140,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089B50.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80072180(); /* extern */
void func_80072180(); /* extern */
extern s32 D_8018D158;
s32 func_80089CBC(s32 objectIndex, f32 arg1) {
@ -1180,7 +1180,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_80089CBC.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80072180(); /* extern */
void func_80072180(); /* extern */
extern s32 D_8018D158;
s32 func_80089F24(s32 objectIndex) {
@ -1441,7 +1441,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008A920.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8008A920(); /* extern */
void func_8008A920(); /* extern */
void func_8008A9B8(s32 objectIndex) {
s32 temp_t9;
@ -1460,7 +1460,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008A9B8.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8008A920(); /* extern */
void func_8008A920(); /* extern */
void func_8008AA3C(s32 objectIndex) {
s32 temp_v1;
@ -1485,7 +1485,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008AA3C.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8008A9B8(); /* extern */
void func_8008A9B8(); /* extern */
void func_8008AB10(s32 objectIndex) {
s16 temp_t0;
@ -1625,11 +1625,11 @@ UNUSED void func_8008AE94(void) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_80165760;
extern ? D_80165770;
extern ? D_80165780;
extern ? D_80165C18;
extern ? D_80183DC8;
extern s16 D_80165760;
extern s16 D_80165770;
extern s16 D_80165780;
extern struct_80165C18_entry D_80165C18;
extern s32 D_80183DC8;
void func_8008AE9C(s32 arg0) {
f32 temp_f0;
@ -1674,11 +1674,11 @@ UNUSED void func_8008B030(void) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_80165760;
extern ? D_80165770;
extern ? D_80165780;
extern ? D_80165C18;
extern ? D_80183DA8;
extern s16 D_80165760;
extern s16 D_80165770;
extern s16 D_80165780;
extern struct_80165C18_entry D_80165C18;
extern s32 D_80183DA8;
void func_8008B038(s32 arg0) {
f32 temp_f0;
@ -1774,7 +1774,6 @@ extern s16 D_80165780;
extern s16 D_80165782;
extern s16 D_80165784;
extern s16 D_80165786;
extern ? D_80165C18;
void func_8008B284(s32 arg0) {
s32 sp0;
@ -1860,9 +1859,9 @@ void func_8008B44C(s32 arg0) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8008B1D4(s32); /* extern */
? func_8008B284(s32); /* extern */
? func_8008B3E4(); /* extern */
void func_8008B1D4(s32); /* extern */
void func_8008B284(s32); /* extern */
void func_8008B3E4(); /* extern */
extern f64 D_800EF508;
extern f64 D_800EF510;
@ -1909,7 +1908,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B478.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8008B478(?); /* extern */
void func_8008B478(?); /* extern */
void func_8008B620(s32 objectIndex) {
s16 temp_t0;
@ -1933,7 +1932,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B620.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8008B478(?); /* extern */
void func_8008B478(?); /* extern */
void func_8008B6A4(s32 objectIndex) {
s16 temp_t0;
@ -1957,7 +1956,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B6A4.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_8008B620(); /* extern */
void func_8008B620(); /* extern */
extern ? D_80165CC6;
void func_8008B724(s32 objectIndex) {
@ -1981,7 +1980,7 @@ GLOBAL_ASM("asm/non_matchings/code_80086E70/func_8008B724.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8008B6A4(); // extern
void func_8008B6A4(); // extern
extern ? D_80165CC6;
void func_8008B78C(s32 arg0) {
@ -2135,8 +2134,8 @@ void func_8008BF18(s32 objectIndex) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern ? D_80183E40;
extern ? D_80183E80;
extern f32 D_80183E40;
extern s16 D_80183E80;
void func_8008BF64(s32 objectIndex) {
struct_80165C18_entry *temp_v0;
@ -2160,10 +2159,10 @@ void func_8008BFC0(s32 objectIndex) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80088228(); /* extern */
? func_80088364(); /* extern */
? func_8008B620(); /* extern */
? func_8008B6A4(); /* extern */
void func_80088228(); /* extern */
void func_80088364(); /* extern */
void func_8008B620(); /* extern */
void func_8008B6A4(); /* extern */
void func_8008BFFC(s32 objectIndex) {
s16 temp_v0;

View File

@ -338,7 +338,7 @@ void func_8008C8C4(Player* player, s8 arg1) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern ? D_8018D920;
extern s16 D_8018D920;
static ? D_800E6F60; /* unable to generate initializer */
void func_8008C9EC(Player *player, s8 arg1) {
@ -378,7 +378,7 @@ void func_8008C9EC(Player *player, s8 arg1) {
if ((s16) ((s32) (temp_t7 & 0xFFFF) / (s32) (0x10000 / (s32) (0x168 / (s32) ((s16) (&sp30[0])[temp_v1] / 182)))) == 0) {
player->unk_0B2 = temp_v1 - 1;
if (player->unk_0B2 <= 0) {
if (gModeSelection == 3) {
if (gModeSelection == BATTLE) {
func_8006B8B4(player, arg1);
}
func_8008C8C4(player, arg1);
@ -395,7 +395,7 @@ void func_8008C9EC(Player *player, s8 arg1) {
player->unk_0B2 = temp_v1_2 - 1;
if (player->unk_0B2 <= 0) {
func_8008C8C4(player, arg1);
if (gModeSelection == 3) {
if (gModeSelection == BATTLE) {
func_8006B8B4(player, arg1);
}
}
@ -948,7 +948,7 @@ void func_8008DF98(Player* player, s8 arg1) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern ? D_8018D920;
extern s16 D_8018D920;
void func_8008E118(Player *player, s8 arg1) {
s16 *temp_v0_2;
@ -1072,7 +1072,7 @@ void func_8008E4A4(Player* player, s8 arg1) {
if ((D_80165460[arg1] == 1) && ((player->unk_000 & 0x4000) == 0x4000)) {
player->unk_09C += 100.0f;
}
if (gModeSelection == 3) {
if (gModeSelection == BATTLE) {
func_8006B8B4(player, arg1);
}
} else {
@ -1089,7 +1089,7 @@ void func_8008E4A4(Player* player, s8 arg1) {
D_80165190[3][arg1] = 1;
player->unk_042 = 0;
if (gModeSelection == 3) {
if (gModeSelection == BATTLE) {
func_8006B8B4(player, arg1);
}
if ((D_80165460[arg1] == 1) && ((player->unk_000 & 0x4000) == 0x4000)) {
@ -1120,7 +1120,7 @@ void func_8008E6C0(Player *player, s8 arg1)
player->unk_0E0 = 0;
if (((player->unk_000 & 0x4000) == 0x4000) && ((player->unk_000 & 0x100) != 0x100)) {
if (((gModeSelection == 2) && ((player->unk_000 & 0x1000) != 0)) && (D_800DC51C == 0)) {
if (((gModeSelection == VERSUS) && ((player->unk_000 & 0x1000) != 0)) && (D_800DC51C == 0)) {
func_800CA24C(arg1);
}
@ -1128,7 +1128,7 @@ void func_8008E6C0(Player *player, s8 arg1)
}
func_800C90F4(arg1, (player->characterId * 0x10) + 0x29008005);
if (((gModeSelection == 2) && ((player->unk_000 & 0x1000) != 0)) && (D_800DC51C == 0)) {
if (((gModeSelection == VERSUS) && ((player->unk_000 & 0x1000) != 0)) && (D_800DC51C == 0)) {
func_800CA24C(arg1);
}
func_800C9060(arg1, 0x19009005);
@ -1436,7 +1436,7 @@ void func_8008F494(Player* player, s8 arg1) {
((player->unk_0BC & 0x40) != 0) ||
((player->unk_0BC << 7) < 0) ||
((player->unk_0BC << 6) < 0) ||
((player->unk_0BC & 0x400) != 0)) && (gModeSelection == 3)) {
((player->unk_0BC & 0x400) != 0)) && (gModeSelection == BATTLE)) {
player->unk_044 |= 0x8000;
}
@ -2031,10 +2031,10 @@ void func_80090868(Player* player) {
// Should put this func through mips to C prior to decomp.
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_80090178(Player *, s8, f32 *, f32 *); /* extern */
? func_8009E020(s8, ?); /* extern */
? func_8009E088(s8, ?); /* extern */
? func_800C9018(u8, ?); /* extern */
void func_80090178(Player *, s8, f32 *, f32 *); /* extern */
void func_8009E020(s8, ?); /* extern */
void func_8009E088(s8, ?); /* extern */
void func_800C9018(u8, ?); /* extern */
extern ? D_80165330;
void func_80090970(Player *player, s8 arg1, s8 arg2) {
@ -2170,7 +2170,7 @@ void func_80090970(Player *player, s8 arg1, s8 arg2) {
if (player->unk_000 & 0x4000) {
func_800C9018((u8) arg1, 0x0100FA28);
}
if (gModeSelection == 3) {
if (gModeSelection == BATTLE) {
func_8006B8B4(player, arg1);
}
player->unk_0CA &= 0xFFFD;
@ -2288,7 +2288,7 @@ void func_800911B4(Player* player, s8 arg1) {
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
extern s8 D_801658BC;
extern ? D_8018D920;
extern s16 D_8018D920;
static ? D_800E706C; /* unable to generate initializer */
void func_80091298(Player *player, s8 arg1) {

File diff suppressed because it is too large Load Diff

View File

@ -359,7 +359,7 @@ GLOBAL_ASM("asm/non_matchings/menus/func_800B5020.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75
? populate_time_trial_record(u8 *, u32, s32, s32); /* extern */
void populate_time_trial_record(u8 *, u32, s32, s32); /* extern */
extern ? D_8018CA74;
s8 gCharacterSelections[4]; /* unable to generate initializer; const */
@ -574,7 +574,7 @@ GLOBAL_ASM("asm/non_matchings/menus/func_800B559C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_8018EB90;
extern SaveData D_8018EB90;
s32 func_800B578C(s32 arg0) {
s32 temp_a0;
@ -646,7 +646,7 @@ s32 func_800B58C4(s32 arg0)
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s8 compute_save_data_checksum_backup_1(); // extern
s8 compute_save_data_checksum_backup_2(); // extern
extern ? D_8018EB90;
extern SaveData D_8018EB90;
extern union GrandPrixPointsUnion D_8018ED10;
extern u8 D_8018ED11;
extern u8 D_8018ED12;
@ -734,9 +734,9 @@ extern s32 D_8018EB78;
extern s32 D_8018EB7C;
extern s32 gControllerPakNumPagesFree;
extern s32 D_8018EB84;
extern ? gSIEventMesgQueue;
extern OSMesgQueue gSIEventMesgQueue;
? func_800B5B94(void) {
s32 func_800B5B94(void) {
s32 temp_v0_2;
s32 temp_v0_3;
s8 temp_v0;
@ -824,7 +824,7 @@ extern u8 D_800F2E64;
extern u8 D_800F2E74;
extern OSPfs D_8018E8D0;
extern s32 D_8018EB88;
extern ? gSIEventMesgQueue;
extern OSMesgQueue gSIEventMesgQueue;
s8 func_800B5DA4(void) {
s32 temp_v0_2;
@ -978,14 +978,14 @@ GLOBAL_ASM("asm/non_matchings/menus/func_800B60E8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_800051C4(); // extern
s32 func_800051C4(); // extern
s32 func_800B6088(s32); // extern
s8 func_800B60E8(s32); // extern
extern u8 *D_800DC714;
extern s32 D_80162DFC;
extern OSPfs D_8018E868;
extern s32 D_8018EB84;
extern ? D_8018EE10;
extern struct_8018EE10_entry D_8018EE10;
extern s8 gCupSelection;
s32 func_800B6178(s32 arg0) {

View File

@ -179,8 +179,8 @@ void func_80280A28(Vec3f arg0, Vec3s arg1, f32 arg2) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
//? func_8004B35C(s16, s16, s16, s16); // extern
//? func_80280A28(?, f32 *, s16 *, ?); // extern
//void func_8004B35C(s16, s16, s16, s16); // extern
//void func_80280A28(?, f32 *, s16 *, ?); // extern
extern u8 D_0D008DB8;
extern u8 D_0D008E48;
extern s16 D_80164AF0;
@ -278,8 +278,8 @@ GLOBAL_ASM("asm/non_matchings/code_80280650/func_80280B50.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80280B50(f32 *, f32, s32, s16); // extern
extern ? D_80284E50;
void func_80280B50(f32 *, f32, s32, s16); // extern
extern s32 D_80284E50;
void func_80280D1C(void *arg0) {
f32 sp60;
@ -440,12 +440,12 @@ GLOBAL_ASM("asm/non_matchings/code_80280650/func_8028118C.s")
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
? func_8028101C(?, s32, ?); /* extern */
? func_8028118C(?, s32, ?); /* extern */
? guLookAtF(? *, f32, f32, f32, f32, f32, f32, f32, f32, f32); /* extern */
void func_8028101C(?, s32, ?); /* extern */
void func_8028118C(?, s32, ?); /* extern */
void guLookAtF(? *, f32, f32, f32, f32, f32, f32, f32, f32, f32); /* extern */
extern s16 D_802874C4;
extern s32 D_802874E0;
extern ? D_80287500;
extern Mat4 D_80287500;
void func_802812C8(void) {
f32 temp_f0;
@ -479,7 +479,7 @@ GLOBAL_ASM("asm/non_matchings/code_80280650/func_802812C8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_802812C8(); // extern
void func_802812C8(); // extern
extern ? D_80284E94;
extern s16 D_802874D0;
extern void *D_802874F8;

View File

@ -246,7 +246,7 @@ GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80282700.s")
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
? func_80282700(f32, f32, f32 *, f32 *, f32 *, f32 *, f32 *, f32 *); /* extern */
void func_80282700(f32, f32, f32 *, f32 *, f32 *, f32 *, f32 *, f32 *); /* extern */
s32 func_802828C8(f32 *arg0, f32 *arg1, s32 arg2, s16 *arg3, f32 *arg4) {
s32 sp94;
@ -358,7 +358,7 @@ GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80282BE4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80282BE4(s8, u8, s8, void *, void *, void *); // extern
void func_80282BE4(s8, u8, s8, void *, void *, void *); // extern
void func_80282C40(s32 arg0, void *arg1, void *arg2) {
s32 temp_s1;
@ -504,7 +504,7 @@ GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_802830B4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80282364(void *, ?, s16, void *); // extern
s32 func_80282364(void *, ?, s16, void *); // extern
f32 coss(s32, void *); // extern
void func_80283100(void *arg0, f32 *arg1) {
@ -679,10 +679,10 @@ GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_80283430.s")
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
? func_80282F44(?, s32 *, Camera *); /* extern */
? func_80283100(s32 *, f32 *); /* extern */
void func_80282F44(?, s32 *, Camera *); /* extern */
void func_80283100(s32 *, f32 *); /* extern */
s32 func_8028336C(s32 *, Camera *); /* extern */
? func_80284AE8(s32 *); /* extern */
void func_80284AE8(s32 *); /* extern */
extern f32 D_802876EC;
extern f32 D_802876F8;
extern s8 D_802876FC;
@ -954,7 +954,7 @@ void func_80284154(Camera *camera) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
//? func_802821A0(void *, f32, ?); // extern
//s32 func_802821A0(void *, f32, ?); // extern
extern s32 D_80165C20;
extern s32 D_80183EAC;
extern f32 D_80287478;
@ -1076,7 +1076,7 @@ void func_802846B4(s32 arg0) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
//? func_80282D90(? *, ? *, ?); // extern
//s32 func_80282D90(? *, ? *, ?); // extern
extern s32 D_80285CB0;
extern s32 D_80285CE0;
extern f32 D_8028747C;
@ -1099,7 +1099,7 @@ GLOBAL_ASM("asm/non_matchings/code_80281FA0/func_802846E4.s")
#ifdef MIPS_TO_C
//generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9
? func_80280268(u8); /* extern */
void func_80280268(u8); /* extern */
static ? D_80286A04; /* unable to generate initializer */
static ? D_80286A10; /* unable to generate initializer */
static u16 D_80286B34[0x14] = {
@ -1184,7 +1184,7 @@ block_3:
func_80282D90(arg0, temp_v0_4->unk4, temp_v0_4->unk8, 0);
break;
}
if (gCCSelection == 3) {
if (gCCSelection == CC_EXTRA) {
sp2C = D_80286B34[D_800DC5E4];
}
if (sp2C == D_802876D2) {
@ -1206,7 +1206,7 @@ struct _struct_D_80286B5C_0x8 {
/* 0x6 */ char pad6[2];
}; /* size = 0x8 */
? func_802847CC(); /* extern */
void func_802847CC(); /* extern */
static ? D_80285D10; /* unable to generate initializer */
static ? D_80285D58; /* unable to generate initializer */
static struct _struct_D_80286B5C_0x8 D_80286B5C[2] = { { func_802847CC, 0x7FFF }, { NULL, 0 } };

View File

@ -178,14 +178,14 @@ void func_80027A20(Player *player, s8 arg1, s8 arg2, s8 arg3) {
// but its better to understand it as a 3-dimensional struct_D_802F1F80 array.
struct_D_802F1F80 *temp_s0 = &D_802F1F80[arg3][arg2][arg1 << 7];
switch(gActiveScreenMode) {
case 0:
case 1:
case 2:
case SCREEN_MODE_1P:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
osInvalDCache(temp_s0, sizeof(struct_D_802F1F80));
osPiStartDma(&gDmaIoMesg, OS_MESG_PRI_NORMAL, OS_READ, &_kart_texturesSegmentRomStart[SEGMENT_OFFSET(gKartPalettes[player->characterId])], temp_s0, sizeof(struct_D_802F1F80), &gDmaMesgQueue);
osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, OS_MESG_BLOCK);
break;
case 3:
case SCREEN_MODE_3P_4P_SPLITSCREEN:
osInvalDCache(temp_s0, sizeof(struct_D_802F1F80));
osPiStartDma(&gDmaIoMesg, OS_MESG_PRI_NORMAL, OS_READ, &_kart_texturesSegmentRomStart[SEGMENT_OFFSET(gKartPalettes[player->characterId])], temp_s0, sizeof(struct_D_802F1F80), &gDmaMesgQueue);
osRecvMesg(&gDmaMesgQueue, &gMainReceivedMesg, OS_MESG_BLOCK);

View File

@ -42,29 +42,29 @@ struct SPTask* sNextDisplaySPTask = NULL;
struct Controller gControllers[8];
struct Controller *gControllerOne = &gControllers[0]; // 0x800DC4BC
struct Controller *gControllerTwo = &gControllers[1]; // 0x800DC4C0
struct Controller *gControllerThree = &gControllers[2]; // 0x800DC4C4
struct Controller *gControllerFour = &gControllers[3]; // 0x800DC4C8
struct Controller *gControllerFive = &gControllers[4]; // 0x800DC4CC
struct Controller *gControllerSix = &gControllers[5]; // 0x800DC4D0
struct Controller *gControllerSeven = &gControllers[6]; // 0x800DC4D4
struct Controller *gControllerEight = &gControllers[7]; // 0x800DC4D8
struct Controller *gControllerOne = &gControllers[0];
struct Controller *gControllerTwo = &gControllers[1];
struct Controller *gControllerThree = &gControllers[2];
struct Controller *gControllerFour = &gControllers[3];
struct Controller *gControllerFive = &gControllers[4];
struct Controller *gControllerSix = &gControllers[5];
struct Controller *gControllerSeven = &gControllers[6];
struct Controller *gControllerEight = &gControllers[7];
Player gPlayers[8];
Player *gPlayerOne = &gPlayers[0]; // 0x800DC4DC
Player *gPlayerTwo = &gPlayers[1]; // 0x800DC4E0
Player *gPlayerThree = &gPlayers[2]; // 0x800DC4E4
Player *gPlayerFour = &gPlayers[3]; // 0x800DC4E8
Player *gPlayerFive = &gPlayers[4]; // 0x800DC4EC
Player *gPlayerSix = &gPlayers[5]; // 0x800DC4F0
Player *gPlayerSeven = &gPlayers[6]; // 0x800DC4F4
Player *gPlayerEight = &gPlayers[7]; // 0x800DC4F8
Player *gPlayerOne = &gPlayers[0];
Player *gPlayerTwo = &gPlayers[1];
Player *gPlayerThree = &gPlayers[2];
Player *gPlayerFour = &gPlayers[3];
Player *gPlayerFive = &gPlayers[4];
Player *gPlayerSix = &gPlayers[5];
Player *gPlayerSeven = &gPlayers[6];
Player *gPlayerEight = &gPlayers[7];
Player *gPlayerOneCopy = &gPlayers[0]; // 0x800DC4FC
Player *gPlayerTwoCopy = &gPlayers[1]; // 0x800DC500
UNUSED Player *gPlayerThreeCopy = &gPlayers[2]; // 0x800DC504
UNUSED Player *gPlayerFourCopy = &gPlayers[3]; // 0x800DC508
Player *gPlayerOneCopy = &gPlayers[0];
Player *gPlayerTwoCopy = &gPlayers[1];
UNUSED Player *gPlayerThreeCopy = &gPlayers[2];
UNUSED Player *gPlayerFourCopy = &gPlayers[3];
s32 D_800FD850[3];
struct GfxPool gGfxPools[2];
@ -158,7 +158,7 @@ u16 gEnableDebugMode = 0;
s32 gGamestateNext = 7; // = COURSE_DATA_MENU?;
UNUSED s32 D_800DC528 = 1;
s32 gActiveScreenMode = SCREEN_MODE_1P;
s32 gScreenModeSelection = 0;
s32 gScreenModeSelection = SCREEN_MODE_1P;
UNUSED s32 D_800DC534 = 0;
s32 gPlayerCountSelection1 = 2;
@ -270,6 +270,7 @@ void create_gfx_task_structure(void) {
gGfxSPTask->task.t.yield_data_size = 0xD00; /* Not equal to OS_YIELD_DATA_SIZE */
}
void init_controllers(void) {
osCreateMesgQueue(&gSIEventMesgQueue, &gSIEventMesgBuf[0], ARRAY_COUNT(gSIEventMesgBuf));
osSetEventMesg(OS_EVENT_SI, &gSIEventMesgQueue, (OSMesg) 0x33333333);
@ -281,7 +282,7 @@ void init_controllers(void) {
}
}
void update_controller(s32 index) {
void update_controller(s32 index) {
struct Controller *controller = &gControllers[index];
u16 stick;
@ -817,6 +818,7 @@ void race_logic_loop(void) {
* Note that the state doesn't flip-flop at random but is permanent
* until the state changes (ie. Exit menus and start a race).
*/
void game_state_handler(void) {
switch (gGamestate) {
case 7:

View File

@ -417,7 +417,7 @@ void func_802B5D30(s16 arg0, s16 arg1, s32 arg2) {
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
f32 sins(s32); /* extern */
f32 coss(s32); /* extern */
extern ? gSegmentTable;
extern uintptr_t gSegmentTable;
void func_802B5D64(u32 arg0, u16 arg1, s32 arg2, s32 arg3) {
f32 sp48;
@ -664,7 +664,7 @@ void func_802B64C4(Vec3f arg0, s16 arg1) {
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
? func_802B6A84(f32, ?, f32 *, s16, f32, ?, f32); /* extern */
void func_802B6A84(f32, ?, f32 *, s16, f32, ?, f32); /* extern */
static f64 D_802B9FB8 = 3.141592653589793;
static f64 D_802B9FC0 = 360.0;
@ -768,7 +768,7 @@ GLOBAL_ASM("asm/non_matchings/math_util/func_802B6540.s")
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
? func_802B6A84(f32, f32, f32 (*)[4], s16, f32, ?, f32); /* extern */
void func_802B6A84(f32, f32, f32 (*)[4], s16, f32, ?, f32); /* extern */
static f64 D_802B9FC8 = 3.141592653589793;
static f64 D_802B9FD0 = 360.0;
@ -1339,9 +1339,9 @@ GLOBAL_ASM("asm/non_matchings/math_util/func_802B80D0.s")
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
//This function did not have a glabel in the original assembly, as such it may
//be unused/unnamed
? sins(s32); /* extern */
? coss(s32); /* extern */
extern ? gSegmentTable;
f32 sins(s32); /* extern */
f32 coss(s32); /* extern */
extern uintptr_t gSegmentTable;
void func_802B8414(u32 arg0, void *arg1, u16 arg2, s32 arg3, s32 arg4) {
f32 sp48;

View File

@ -432,7 +432,7 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802A86A8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
//? func_802A86A8(u8 *, s32); // extern
//void func_802A86A8(u8 *, s32); // extern
void func_802A87A8(s32 arg0, u32 arg1) {
//u8 *sp18;
u8 temp_v0;
@ -589,7 +589,7 @@ Gfx D_802B8D58[] = {gsDPTileSync()};
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
static ? D_802B8D58; /* unable to generate initializer */
static Gfx D_802B8D58; /* unable to generate initializer */
@ -678,8 +678,8 @@ Gfx D_802B8D68[] = { gsDPLoadSync() };
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
static ? D_802B8D60; /* unable to generate initializer */
static ? D_802B8D68; /* unable to generate initializer */
static Gfx D_802B8D60; /* unable to generate initializer */
static Gfx D_802B8D68; /* unable to generate initializer */
void func_802A91E4(s32 arg0, s32 arg1, s8 arg2) {
s32 sp48;
@ -1025,13 +1025,13 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802A99A4.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_802A8F80(Gfx *, u8, s8, s32 *); /* extern */
? func_802A91E4(Gfx *, u8, s8, s32 *); /* extern */
? func_802A95B0(Gfx *, u8, s8, s32 *); /* extern */
? func_802A9674(Gfx *, u8, s8, s32 *); /* extern */
? func_802A9714(Gfx *, u8, s8, s32 *); /* extern */
? func_802A980C(Gfx *, u8, s8, s32 *); /* extern */
? func_802A99A4(Gfx *, u8, s8, s32 *); /* extern */
void func_802A8F80(Gfx *, u8, s8, s32 *); /* extern */
void func_802A91E4(Gfx *, u8, s8, s32 *); /* extern */
void func_802A95B0(Gfx *, u8, s8, s32 *); /* extern */
void func_802A9674(Gfx *, u8, s8, s32 *); /* extern */
void func_802A9714(Gfx *, u8, s8, s32 *); /* extern */
void func_802A980C(Gfx *, u8, s8, s32 *); /* extern */
void func_802A99A4(Gfx *, u8, s8, s32 *); /* extern */
extern s32 D_802BA270;
extern s32 D_802BA274;
extern Gfx *gHeapEndPtr;
@ -1326,8 +1326,8 @@ GLOBAL_ASM("asm/non_matchings/memory/display_list_unpack.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? MIO0_0F(s32, s32, s32); // extern
extern ? gSegmentTable;
u32 MIO0_0F(s32, s32, s32); // extern
extern uintptr_t gSegmentTable;
void func_802AA7C8(u32 arg0) {
void *sp20;
@ -1367,7 +1367,7 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802AA7C8.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? dma_copy(u8 *, s32, s32, s32); // extern
void dma_copy(u8 *, s32, s32, s32); // extern
extern u8 *gPrevLoadedAddress;
s32 func_802AA88C(s32 arg0, s32 arg1) {
@ -1395,9 +1395,9 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802AA88C.s")
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? display_list_unpack(u32 *, u32 *, s32); /* extern */
? func_802A87A8(mk64_Vtx *, u32); /* extern */
? func_802AA7C8(u32 *); /* extern */
void display_list_unpack(u32 *, u32 *, s32); /* extern */
void func_802A87A8(mk64_Vtx *, u32); /* extern */
void func_802AA7C8(u32 *); /* extern */
void *func_802AA88C(u32 *, u32 *); /* extern */
extern s32 gGamestate;
extern s32 gHeapEndPtr;
@ -2046,7 +2046,7 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802AB6C4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_802ABB04(f32 arg0, f32 arg1, s32 arg2) {
s32 func_802ABB04(f32 arg0, f32 arg1, s32 arg2) {
f32 sp6C;
f32 sp64;
f32 sp60;
@ -2285,7 +2285,7 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802AC114.s")
mk64_surface_map_ram *func_802AAE4C(s16 *, ?, f32, f32, f32, s32); /* extern */
mk64_surface_map_ram *func_802AB288(s16 *, ?, f32, f32, f32, s32); /* extern */
mk64_surface_map_ram *func_802AB6C4(s16 *, ?, f32, f32, f32, s32); /* extern */
extern ? D_8014F110;
extern u8 D_8014F110;
extern s32 D_8015F584;
extern s16 D_8015F6E8;
extern s16 D_8015F6EA;
@ -2439,7 +2439,7 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802AC22C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_802AC760(void *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5, f32 arg6, f32 arg7, f32 arg8) {
s32 func_802AC760(void *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5, f32 arg6, f32 arg7, f32 arg8) {
f32 sp6C;
f32 sp64;
f32 sp38;
@ -2581,7 +2581,7 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802AC760.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_802ACBA4(void *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5, f32 arg6, f32 arg7, f32 arg8) {
s32 func_802ACBA4(void *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5, f32 arg6, f32 arg7, f32 arg8) {
f32 sp70;
f32 sp6C;
f32 sp48;
@ -2811,7 +2811,7 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802ACBA4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_802AD278(void *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5, f32 arg6, f32 arg7, f32 arg8) {
s32 func_802AD278(void *arg0, f32 arg1, f32 arg2, f32 arg3, f32 arg4, u16 arg5, f32 arg6, f32 arg7, f32 arg8) {
f32 sp68;
f32 sp64;
f32 sp44;
@ -3043,7 +3043,7 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802AD278.s")
s32 func_802AC760(f32, f32, f32, f32, f32, f32, f32, f32, f32); /* extern */
s32 func_802ACBA4(UnkActorInner *, f32, f32, f32, f32, s32, f32, f32, f32); /* extern */
s32 func_802AD278(UnkActorInner *, f32, f32, f32, f32, s32, f32, f32, f32); /* extern */
extern ? D_8014F110;
extern u8 D_8014F110;
extern s32 D_8015F584;
extern s16 D_8015F6E8;
extern s16 D_8015F6EA;
@ -3164,7 +3164,7 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802AD950.s")
s32 func_802AAE4C(void *, f32, f32, f32, f32, s32); // extern
s32 func_802AB288(void *, void *, f32, f32, f32, s32); // extern
s32 func_802AB6C4(void *, void *, f32, f32, f32, s32); // extern
extern ? D_8014F110;
extern u8 D_8014F110;
extern s32 D_8015F584;
s32 func_802ADDC8(void *arg0, void *arg1, f32 arg2, f32 arg3, f32 arg4) {
@ -3280,7 +3280,7 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802ADDC8.s")
//generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75
s32 func_802ABB04(f32, f32, s32); /* extern */
f32 func_802ABE30(f32, f32, f32, s32); /* extern */
extern ? D_8014F110;
extern u8 D_8014F110;
extern s32 D_8015F584;
extern s16 D_8015F6E8;
extern s16 D_8015F6EA;
@ -3640,7 +3640,7 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802AE434.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_802AE434(s32, s32, s32, s8, s32); // extern
void func_802AE434(s32, s32, s32, s8, s32); // extern
extern ? D_8015F668;
void func_802AEB14(s32 arg0, s8 arg1, u16 arg2) {
@ -3652,7 +3652,7 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802AEB14.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_802AE434(s32, s32, s32, s8, s32); // extern
void func_802AE434(s32, s32, s32, s8, s32); // extern
extern ? D_8015F668;
void func_802AEBA4(s32 arg0, s32 arg1, s8 arg2, u16 arg3) {
@ -3672,7 +3672,7 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802AEBA4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_802AE434(s32, s32, s32, s8, s32); // extern
void func_802AE434(s32, s32, s32, s8, s32); // extern
extern ? D_8015F668;
void func_802AECA0(s32 arg0, s8 arg1, u16 arg2) {
@ -3697,7 +3697,7 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802AECA0.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_8015F668;
extern ? gSegmentTable;
extern uintptr_t gSegmentTable;
void func_802AED6C(u32 arg0, s32 arg1, s32 arg2) {
s32 temp_a2;
@ -3770,7 +3770,7 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802AED6C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_802AEE1C(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6, s16 arg7) {
s32 func_802AEE1C(s16 arg0, s16 arg1, s16 arg2, s16 arg3, s16 arg4, s16 arg5, s16 arg6, s16 arg7) {
f32 temp_f0;
f32 temp_f0_2;
f32 temp_f12;
@ -3944,8 +3944,8 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802AF0FC.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75
s32 func_802AF0FC(s16, s16, s16, s16, s32); /* extern */
extern ? D_8014F110;
extern ? gNumActors;
extern u8 D_8014F110;
extern u16 gNumActors;
extern s32 D_8015F584;
extern u16 D_8015F58A;
extern s16 D_8015F6E8;
@ -4052,13 +4052,13 @@ void func_802AF5AC(s32 arg0, s8 arg1) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_802AEB14(u32, s8, s32); // extern
? func_802AEBA4(u32, u32, s8, s32); // extern
? func_802AECA0(u32, s8, s32); // extern
? func_802AED6C(u32, s32, u32); // extern
void func_802AEB14(u32, s8, s32); // extern
void func_802AEBA4(u32, u32, s8, s32); // extern
void func_802AECA0(u32, s8, s32); // extern
void func_802AED6C(u32, s32, u32); // extern
extern s16 D_8015F6FA;
extern s16 D_8015F6FC;
extern ? gSegmentTable;
extern uintptr_t gSegmentTable;
void func_802AF5D8(u32 arg0, s8 arg1, s32 arg2) {
s32 temp_s5;
@ -4146,7 +4146,7 @@ void func_802AF7B4(uintptr_t addr, s32 arg1, s32 arg2) {
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? gSegmentTable;
extern uintptr_t gSegmentTable;
void func_802AF83C(u32 arg0, u32 arg1, ? arg2, s8 arg3, u8 arg4, u8 arg5, u8 arg6) {
u32 temp_v1;
@ -4175,8 +4175,8 @@ GLOBAL_ASM("asm/non_matchings/memory/func_802AF83C.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_802AF83C(u32, s32, u32, s8, s32, s32, s32); // extern
extern ? gSegmentTable;
void func_802AF83C(u32, s32, u32, s8, s32, s32, s32); // extern
extern uintptr_t gSegmentTable;
void func_802AF8BC(u32 arg0, s8 arg1, s32 arg2, s32 arg3, u8 arg4) {
s32 temp_s2;
@ -4227,8 +4227,8 @@ f32 func_802ABE30(f32, f32, f32, u16); /* extern */
s32 func_802AC760(s16 *, f32, f32, f32, f32, s32, f32, f32, f32); /* extern */
s32 func_802ACBA4(s16 *, f32, f32, f32, f32, s32, f32, f32, f32); /* extern */
s32 func_802AD278(s16 *, f32, f32, f32, f32, s32, f32, f32, f32); /* extern */
? func_802AF9F0(f32, ? *, ?32, kartBoundingBoxCorner *); /* extern */
extern ? D_8014F110;
void func_802AF9F0(f32, ? *, ?32, kartBoundingBoxCorner *); /* extern */
extern u8 D_8014F110;
extern s32 D_8015F584;
extern s16 D_8015F6E8;
extern s16 D_8015F6EA;

View File

@ -95,21 +95,24 @@ const s8 D_800F2B50[] = {0, 1, 2, 3, 3, 0, 0, 0};
// set to D_8018EDF3, then that sets gPlayerCountSelection1
const s8 D_800F2B58[] = {1, 2, 2, 3, 4, 0, 0, 0};
const s8 D_800F2B60[5][3] = {
{1, 2, 1},
{1, 2, 1},
{0, 2, 2},
{0, 2, 0},
{0, 2, 0}
// Limit for each column in one-two-three-four players selection
const s8 D_800F2B60[4] = {1, 2, 1, 1};
// Limit in each column
const s8 D_800F2B64[4][3] = {
{2, 1, 0},
{2, 2, 0},
{2, 0, 0},
{2, 0, 0}
};
// is this another union GameModePack? Figure out when decomping.
const s32 gGameModeFromNumPlayersAndRowSelection[5][3] = {
{ 0x03010003, 0x03000300, 0x00030000 },
{ 0x00000000, 0x00000001, 0x00000000 },
{ 0x00000000, 0x00000002, 0x00000003 },
{ 0x00000002, 0x00000003, 0x00000000 },
{ 0x00000002, 0x00000003, 0x00000000 },
{ 0x03010003, 0x03000300, 0x00030000 },
{ GRAND_PRIX, TIME_TRIALS, 0x00000000 }, //first column
{ GRAND_PRIX, VERSUS, BATTLE }, //second
{ VERSUS, BATTLE, 0x00000000 }, //third
{ VERSUS, BATTLE, 0x00000000 }, //four
};
// map from character grid position id to character id
@ -1233,9 +1236,9 @@ void splash_menu_act(struct Controller *controller, u16 arg1) {
if (controller->button & Z_TRIG) {
if (btnAndStick & CONT_A) {
gDebugGotoScene = 1;
gDebugGotoScene = DEBUG_GOTO_ENDING_SEQUENCE;
} else {
gDebugGotoScene = 3;
gDebugGotoScene = DEBUG_GOTO_CREDITS_SEQUENCE_CC_EXTRA;
}
}
play_sound2(0x49008016);
@ -1243,7 +1246,7 @@ void splash_menu_act(struct Controller *controller, u16 arg1) {
func_8009E1C0();
func_800CA330(0x19);
gDebugMenuSelection = DEBUG_MENU_EXITED;
gDebugGotoScene = 2;
gDebugGotoScene = DEBUG_GOTO_CREDITS_SEQUENCE_CC_50;
play_sound2(0x49008016);
} else if (btnAndStick & CONT_R) {
gDebugMenuSelection = DEBUG_MENU_DISABLED;
@ -1301,12 +1304,12 @@ void main_menu_act(struct Controller *controller, u16 arg1) {
if (!func_800B4520()) {
switch (gMainMenuSelectionDepth) {
case 0:
case BLANK_MAIN_MENU:
{
newMode = gGameModeFromNumPlayersAndRowSelection[D_8018EDF3][D_800E86AC[D_8018EDF3 - 1]];
break;
}
case 3:
case PLAYER_NUM_SELECTION:
{
if ((btnAndStick & CONT_RIGHT) && D_8018EDF3 < 4) {
D_8018EDF3 += 1;
@ -1355,7 +1358,7 @@ void main_menu_act(struct Controller *controller, u16 arg1) {
}
break;
}
case 4:
case GAME_MODE_SELECTION:
{
if (btnAndStick & CONT_DOWN) {
if (D_800E86AC[D_8018EDF3 - 1] < D_800F2B58[D_8018EDF3 + 7]) {
@ -1410,8 +1413,8 @@ void main_menu_act(struct Controller *controller, u16 arg1) {
}
break;
}
case 5:
case 8:
case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION:
case TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT:
{
if (1);
if ((arg1 == 0) && (++gMenuTimingCounter == 100 || gMenuTimingCounter % 300 == 0)) {
@ -1431,12 +1434,12 @@ void main_menu_act(struct Controller *controller, u16 arg1) {
if (btnAndStick & CONT_DOWN) {
sp24 = FALSE;
if (func_800B555C()) {
if (sp28 < D_800F2B60[D_8018EDF3 + 4][D_800E86AC[D_8018EDF3 - 1] + 1]) {
if (sp28 < D_800F2B64[D_8018EDF3][D_800E86AC[D_8018EDF3 - 1] + 1]) {
sp24 = TRUE;
}
} else {
// L800B30D4
if (sp28 < D_800F2B60[D_8018EDF3][D_800E86AC[D_8018EDF3 - 1] + 1]) {
if (sp28 < D_800F2B60[D_8018EDF3]) {
sp24 = TRUE;
}
}
@ -1472,8 +1475,8 @@ void main_menu_act(struct Controller *controller, u16 arg1) {
}
break;
}
case 6:
case 7:
case CONFIRM_OK_SELECTION:
case CONFIRM_OK_SELECTION_FROM_BACK_OUT:
{
if ((arg1 == 0) && (++gMenuTimingCounter == 60 || gMenuTimingCounter % 300 == 0)) {
play_sound2(0x4900900F);
@ -1507,8 +1510,8 @@ void main_menu_act(struct Controller *controller, u16 arg1) {
}
break;
}
case 1:
case 2:
case OPTIONS_SELECTION:
case DATA_SELECTION:
{
newMode = gGameModeFromNumPlayersAndRowSelection[D_8018EDF3][D_800E86AC[D_8018EDF3 - 1]];
break;
@ -1822,13 +1825,13 @@ void course_select_menu_act(struct Controller *arg0, u16 arg1) {
void func_800B3F74(s32 menuSelection) {
s32 i;
gDebugMenuSelection = 1;
gDebugMenuSelection = DEBUG_MENU_DISABLED;
gMenuTimingCounter = 0;
D_8018EE04 = 0;
D_8018EE08 = 0;
D_8015F890 = 0;
D_8015F892 = 0;
gDebugGotoScene = 0;
gDebugGotoScene = DEBUG_GOTO_RACING;
D_8018EDFB = 0;
D_8016556E = 0;
*D_80162DD4 = 1;
@ -1844,7 +1847,7 @@ void func_800B3F74(s32 menuSelection) {
case 8: func_800CA008(0, 0); break;
case 9:
{
gControllerPakMenuSelection = 1;
gControllerPakMenuSelection = CONTROLLER_PAK_MENU_SELECT_RECORD;
func_800CA008(0, 0);
break;
}
@ -1853,7 +1856,7 @@ void func_800B3F74(s32 menuSelection) {
{
gIsMirrorMode = 0;
gEnableDebugMode = 0;
gCupSelection = 0;
gCupSelection = MUSHROOM_CUP;
gCupCourseSelection = 0;
gTimeTrialDataCourseIndex = 0;
if (D_8018EDF3 <= 0) {
@ -1908,8 +1911,8 @@ void func_800B3F74(s32 menuSelection) {
default:
gMainMenuSelectionDepth = TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT;
break;
case 1:
case 2:
case OPTIONS_SELECTION:
case DATA_SELECTION:
gMainMenuSelectionDepth = PLAYER_NUM_SELECTION;
break;
}

View File

@ -23,7 +23,7 @@ extern s8 gControllerPakSelectedTableRow;
extern s8 D_800E86C4[12];
extern s8 D_800E86D0[16];
extern const s8 D_800F2B60[5][3];
extern const s8 D_800F2B60[4];
extern const s32 gGameModeFromNumPlayersAndRowSelection[5][3];
extern const s16 gCupCourseOrder[5][4];

View File

@ -270,7 +270,7 @@ void func_8028E438(void) {
D_80150148 = (f32) ((f32) temp_v0->screenWidth / (f32) temp_v0->screenHeight);
if (phi_v1_4 == 4) {
D_8015F894 = 2;
gActiveScreenMode = 0;
gActiveScreenMode = SCREEN_MODE_1P;
D_800DC5EC->screenWidth = temp_v0->screenWidth;
D_800DC5EC->screenHeight = temp_v0->screenHeight;
D_800DC5EC->screenStartX = temp_v0->screenStartX;
@ -405,7 +405,7 @@ void func_8028E678(void) {
D_800DC5F0->screenStartX = D_800DC5EC->screenStartX;
D_800DC5F0->screenStartY = D_800DC5EC->screenStartY;
gActiveScreenMode = 2;
gActiveScreenMode = SCREEN_MODE_2P_SPLITSCREEN_VERTICAL;
D_80150148 = 1.33333337;
gPlayerCountSelection1 = 2;
func_8003DB5C();
@ -771,9 +771,8 @@ void func_8028F588(void) {
s16 var_v0_8;
s32 temp_v0;
temp_v0 = gActiveScreenMode;
switch (temp_v0) { /* irregular */
case 0:
switch (gActiveScreenMode) { /* irregular */
case SCREEN_MODE_1P:
var_v0 = (s16) (s32) (320.0f * D_802BA034);
if (var_v0 < 0) {
var_v0 = 1;
@ -785,7 +784,7 @@ void func_8028F588(void) {
}
D_800DC5EC->unk2E = var_v0_2;
return;
case 2:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
var_v0_3 = (s16) (s32) (160.0f * D_802BA034);
if (var_v0_3 <= 0) {
var_v0_3 = 1;
@ -803,7 +802,7 @@ void func_8028F588(void) {
D_800DC5EC->unk2E = var_v0_4;
D_800DC5F0->unk2E = var_v0_4;
return;
case 1:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
var_v0_5 = (s16) (s32) (320.0f * D_802BA034);
if (var_v0_5 <= 0) {
var_v0_5 = 1;
@ -821,7 +820,7 @@ void func_8028F588(void) {
D_800DC5EC->unk2E = var_v0_6;
D_800DC5F0->unk2E = var_v0_6;
return;
case 3:
case SCREEN_MODE_3P_4P_SPLITSCREEN:
var_v0_7 = (s16) (s32) (160.0f * D_802BA034);
if (var_v0_7 <= 0) {
var_v0_7 = 1;
@ -867,10 +866,10 @@ void func_8028F914(void) {
#ifdef MIPS_TO_C
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
? func_800029B0(); /* extern */
? func_80005AE8(Player *); /* extern */
? func_800C9F90(?); /* extern */
? play_sound2(?); /* extern */
void func_800029B0(); /* extern */
void func_80005AE8(Player *); /* extern */
void func_800C9F90(?); /* extern */
void play_sound2(?); /* extern */
extern s32 D_80162DF0;
extern void *gControllerOne;
static u16 D_800DC5A8; /* unable to generate initializer */
@ -895,7 +894,7 @@ loop_2:
temp_v0 = var_s3->unk_000;
if ((temp_v0 & 0x4000) && !(temp_v0 & 0x1000)) {
temp_s0 = &gControllers[var_s2];
if (gActiveScreenMode != 3) {
if (gActiveScreenMode != SCREEN_MODE_3P_4P_SPLITSCREEN) {
temp_v0_2 = temp_s0->buttonPressed;
if ((temp_v0_2 & 0x20) && !(temp_s0->button & 0x10)) {
temp_s0->buttonPressed = temp_v0_2 & 0xFFDF;
@ -914,7 +913,7 @@ loop_2:
temp_s0->buttonPressed = 0;
func_800C9F90(1);
D_80162DF0 = 1;
if (gModeSelection == 1) {
if (gModeSelection == TIME_TRIALS) {
temp_a0 = gPlayerOne;
if (temp_a0->unk_000 & 0x8100) {
func_80005AE8(temp_a0);
@ -936,7 +935,7 @@ block_20:
var_s2 += 1;
var_s3 += 0xDD8;
if (var_s2 == 4) {
if ((gEnableDebugMode != 0) && (gModeSelection != 3)) {
if ((gEnableDebugMode != 0) && (gModeSelection != BATTLE)) {
temp_a1 = gControllerOne;
if (temp_a1->unk6 & 0x800) {
gLapCountByPlayerId->unk0 = 2;
@ -1040,7 +1039,7 @@ void func_8028FCBC(void) {
case 1:
func_8028F914();
if (D_802BA034 == 1.0f) {
if (gActiveScreenMode != 0) {
if (gActiveScreenMode != SCREEN_MODE_1P) {
if (gCurrentCourseId == COURSE_LUIGI_RACEWAY) {
func_802A7940();
} else if (gCurrentCourseId == COURSE_WARIO_STADIUM) {
@ -1370,15 +1369,15 @@ void func_80290B14(void) {
func_80059C50();
switch(gActiveScreenMode) {
case 0:
case SCREEN_MODE_1P:
func_8001EE98(gPlayerOneCopy, camera1, 0);
break;
case 1:
case 2:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
func_8001EE98(gPlayerOneCopy, camera1, 0);
func_8001EE98(gPlayerTwoCopy, camera2, 1);
break;
case 3:
case SCREEN_MODE_3P_4P_SPLITSCREEN:
func_8001EE98(gPlayerOneCopy, camera1, 0);
func_8001EE98(gPlayerTwo, camera2, 1);
func_8001EE98(gPlayerThree, camera3, 2);

View File

@ -50,7 +50,7 @@ void func_80290CAC(uintptr_t arg0) {
#ifdef MIPS_TO_C
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
extern ? D_80152300;
extern u16 D_80152300;
s16 gCurrentCourseId; /* unable to generate initializer */
void load_surface_map(u32 arg0, struct UnkStruct_800DC5EC *arg1) {
@ -196,8 +196,8 @@ void func_802911C4(void) {
//generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de
s32 func_80290C20(Camera *); /* extern */
f32 func_802AAB4C(Player *); /* extern */
? init_rdp(); /* extern */
? load_surface_map(? *, struct UnkStruct_800DC5EC *, Gfx **); /* extern */
void init_rdp(); /* extern */
void load_surface_map(? *, struct UnkStruct_800DC5EC *, Gfx **); /* extern */
extern ? D_06009228;
extern ? D_060164B8;
extern ? D_06019578;
@ -379,7 +379,7 @@ block_9:
temp_t7 = gCurrentCourseId;
switch (temp_t7) { /* switch 1 */
case 2: /* switch 1 */
if ((gActiveScreenMode == 0) && ((s32) (u16) sp21A >= 6) && ((s32) (u16) sp21A < 0xA) && (((u16) sp21A != 9) || (((s32) (u16) sp218 >= 0xA000) && ((s32) (u16) sp218 < 0xE001)))) {
if ((gActiveScreenMode == SCREEN_MODE_1P) && ((s32) (u16) sp21A >= 6) && ((s32) (u16) sp21A < 0xA) && (((u16) sp21A != 9) || (((s32) (u16) sp218 >= 0xA000) && ((s32) (u16) sp218 < 0xE001)))) {
temp_v1_7 = gDisplayListHead;
gDisplayListHead = temp_v1_7 + 8;
temp_v1_7->words.w1 = (u32) &D_06009228;
@ -1281,7 +1281,7 @@ void render_luigi_raceway(struct UnkStruct_800DC5EC *arg0) {
D_800DC5DC = 88;
D_800DC5E0 = 72;
if ((gActiveScreenMode == 0) && (sp22 >= 10) && (sp22 < 17)) {
if ((gActiveScreenMode == SCREEN_MODE_1P) && (sp22 >= 10) && (sp22 < 17)) {
prevFrame = (s16)sRenderedFramebuffer - 1;
@ -1497,7 +1497,7 @@ void render_wario_stadium(struct UnkStruct_800DC5EC *arg0) {
D_800DC5DC = 88;
D_800DC5E0 = 72;
if (gActiveScreenMode == 0) {
if (gActiveScreenMode == SCREEN_MODE_1P) {
prevFrame = (s16) sRenderedFramebuffer - 1;
if (prevFrame < 0) {
prevFrame = 2;

View File

@ -442,12 +442,12 @@ void func_802A487C(Vtx *arg0, UNUSED s32 arg1, UNUSED s32 arg2, UNUSED s32 arg3,
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
//? init_rdp(); // extern
//? func_802A450C(); // extern
//? func_802B5564(? *, ? *, s32, s32, f32, f32, f32); // extern
//? func_802B5794(? *, void *, void *); // extern
//? func_802B6434(f32 *, ? *); // extern
//? func_802B71CC(? *, ? *, ? *); // extern
//void init_rdp(); // extern
//void func_802A450C(); // extern
//void func_802B5564(? *, ? *, s32, s32, f32, f32, f32); // extern
//void func_802B5794(? *, void *, void *); // extern
//void func_802B6434(f32 *, ? *); // extern
//void func_802B71CC(? *, ? *, ? *); // extern
extern s32 D_80150148;
extern f32 D_8015014C;
@ -610,16 +610,16 @@ void func_802A4D18(void) {
}
switch(gScreenModeSelection) {
case 0:
case SCREEN_MODE_1P:
D_80150148 = 1.3333333730697632f; // D_802B9C1C
break;
case 1:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
D_80150148 = (f32) 2.6666667461395264f; // D_802B9C24
break;
case 2:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
D_80150148 = 0.6666666865348816f; // D_802B9C20
break;
case 3:
case SCREEN_MODE_3P_4P_SPLITSCREEN:
D_80150148 = 1.3333333730697632f; // D_802B9C28
break;
}
@ -635,19 +635,19 @@ GLOBAL_ASM("asm/non_matchings/skybox/func_802A4D18.s")
void func_802A4EF4(void) {
switch(gActiveScreenMode) {
case 0:
case SCREEN_MODE_1P:
func_8001F394(gPlayerOne, &D_80150130[0]);
break;
case 2:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
func_8001F394(gPlayerOne, &D_80150130[0]);
func_8001F394(gPlayerTwo, &D_80150130[1]);
break;
case 1:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
func_8001F394(gPlayerOne, &D_80150130[0]);
func_8001F394(gPlayerTwo, &D_80150130[1]);
break;
case 3:
case SCREEN_MODE_3P_4P_SPLITSCREEN:
func_8001F394(gPlayerOne, &D_80150130[0]);
func_8001F394(gPlayerTwo, &D_80150130[1]);
func_8001F394(gPlayerThree, &D_80150130[2]);
@ -1286,13 +1286,13 @@ void func_802A74BC(void) {
switch(gActiveScreenMode) {
case 0:
case SCREEN_MODE_1P:
if (i == 0) {
wrapper->screenStartX = 160;
}
wrapper->screenStartY = 120;
break;
case 2:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
if (i == 0) {
wrapper->screenStartX = 80;
wrapper->screenStartY = 120;
@ -1301,7 +1301,7 @@ void func_802A74BC(void) {
wrapper->screenStartY = 120;
}
break;
case 1:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
if (i == 0) {
wrapper->screenStartX = 160;
wrapper->screenStartY = 60;
@ -1310,7 +1310,7 @@ void func_802A74BC(void) {
wrapper->screenStartY = 180;
}
break;
case 3:
case SCREEN_MODE_3P_4P_SPLITSCREEN:
if (i == 0) {
wrapper->screenStartX = 80;
wrapper->screenStartY = 60;

View File

@ -747,9 +747,9 @@ void func_8003C0F0(void) {
case COURSE_WARIO_STADIUM:
case COURSE_DK_JUNGLE:
switch (gActiveScreenMode) {
case 0:
case SCREEN_MODE_1P:
switch (gModeSelection) {
case 0:
case GRAND_PRIX:
D_80165210[0] = (D_80165210[2] = (D_80165210[4] = (D_80165210[6] = sp5E + 0x14)));
D_80165210[1] = (D_80165210[3] = (D_80165210[5] = (D_80165210[7] = sp5E - 0x14)));
D_80165230[0] = sp5C + 0x1E;
@ -763,7 +763,7 @@ void func_8003C0F0(void) {
func_80039F44(D_80165210, D_80165230, sp5A);
break;
case 1:
case TIME_TRIALS:
D_80165210[0] = (D_80165210[2] = (D_80165210[4] = (D_80165210[6] = sp5E)));
D_80165210[1] = (D_80165210[3] = (D_80165210[5] = (D_80165210[7] = sp5E)));
D_80165230[0] = sp5C + 0x1E;
@ -779,10 +779,10 @@ void func_8003C0F0(void) {
}
break;
case 1:
case 2:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
switch (gModeSelection) {
case 0:
case GRAND_PRIX:
D_80165210[0] = (D_80165210[2] = (D_80165210[4] = (D_80165210[6] = sp5E + 0x14)));
D_80165210[1] = (D_80165210[3] = (D_80165210[5] = (D_80165210[7] = sp5E - 0x14)));
D_80165230[0] = sp5C + 0x1E;
@ -796,7 +796,7 @@ void func_8003C0F0(void) {
func_8003A9F0(D_80165210, D_80165230, sp5A);
break;
case 2:
case VERSUS:
D_80165210[0] = (D_80165210[2] = (D_80165210[4] = (D_80165210[6] = sp5E + 0xA)));
D_80165210[1] = (D_80165210[3] = (D_80165210[5] = (D_80165210[7] = sp5E - 0xA)));
D_80165230[0] = sp5C + 0x1E;
@ -812,9 +812,9 @@ void func_8003C0F0(void) {
}
break;
case 3:
case SCREEN_MODE_3P_4P_SPLITSCREEN:
switch (gModeSelection) {
case 2:
case VERSUS:
D_80165210[0] = sp5E + 0x1E;
D_80165210[6] = sp5E - 0xA;
D_80165210[1] = sp5E + 0xA;
@ -845,8 +845,8 @@ void func_8003C0F0(void) {
case COURSE_BLOCK_FORT:
switch (gActiveScreenMode) {
case 1:
case 2:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
temp = 5;
if (1);
D_80165210[0] = 0;
@ -856,7 +856,7 @@ void func_8003C0F0(void) {
spawn_players_2p_battle(D_80165210, D_80165230, temp);
break;
case 3:
case SCREEN_MODE_3P_4P_SPLITSCREEN:
temp = 5;
D_80165210[2] = -200.0f;
D_80165230[1] = -200.0f;
@ -877,8 +877,8 @@ void func_8003C0F0(void) {
case COURSE_SKYSCRAPER:
switch (gActiveScreenMode) {
case 1:
case 2:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
temp = 0x1E0;
if (1);
D_80165210[0] = 0.0f;
@ -888,7 +888,7 @@ void func_8003C0F0(void) {
spawn_players_2p_battle(D_80165210, D_80165230, temp);
break;
case 3:
case SCREEN_MODE_3P_4P_SPLITSCREEN:
temp = 0x1E0;
D_80165210[0] = 0.0f;
D_80165210[1] = 0.0f;
@ -909,8 +909,8 @@ void func_8003C0F0(void) {
case COURSE_DOUBLE_DECK:
switch (gActiveScreenMode) {
case 1:
case 2:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
temp = 0x37;
if (1);
D_80165210[0] = 0.0f;
@ -941,8 +941,8 @@ void func_8003C0F0(void) {
case COURSE_BIG_DONUT:
switch (gActiveScreenMode) {
case 1:
case 2:
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
temp = 0xC8;
if (1);
D_80165210[0] = 0.0f;
@ -952,7 +952,7 @@ void func_8003C0F0(void) {
spawn_players_2p_battle(D_80165210, D_80165230, temp);
break;
case 3:
case SCREEN_MODE_3P_4P_SPLITSCREEN:
temp = 0xC8;
D_80165210[0] = 0.0f;
D_80165210[1] = 0.0f;
@ -994,7 +994,7 @@ void func_8003C0F0(void) {
break;
}
if (gModeSelection != 3) {
if (gModeSelection != BATTLE) {
func_8000F628();
}
}
@ -1043,7 +1043,7 @@ void func_8003D080(void) {
switch (gActiveScreenMode) {
case SCREEN_MODE_1P:
switch (gModeSelection) {
case 0:
case GRAND_PRIX:
if (gCurrentCourseId == 10) {
func_8001C4D0(0.0f, ptr->pos[1], D_8016524C, ptr->unk_02C[1], 8, 0);
} else {
@ -1051,7 +1051,7 @@ void func_8003D080(void) {
}
break;
case 1:
case TIME_TRIALS:
func_8001C4D0(ptr->pos[0], ptr->pos[1], ptr->pos[2], ptr->unk_02C[1], 1, 0);
break;
@ -1064,13 +1064,13 @@ void func_8003D080(void) {
case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL:
case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL:
switch (gModeSelection) {
case 0:
case GRAND_PRIX:
func_8001C4D0(ptr->pos[0], ptr->pos[1], ptr->pos[2], ptr->unk_02C[1], 1, 0);
ptr++;
func_8001C4D0(ptr->pos[0], ptr->pos[1], ptr->pos[2], ptr->unk_02C[1], 1, 1);
break;
case 3:
case BATTLE:
func_8001C4D0(ptr->pos[0], ptr->pos[1], ptr->pos[2], ptr->unk_02C[1], 9, 0);
ptr++;
func_8001C4D0(ptr->pos[0], ptr->pos[1], ptr->pos[2], ptr->unk_02C[1], 9, 1);

View File

@ -546,7 +546,7 @@ void func_80005B18(void) {
if (D_80162DEC > 100) {
D_80162DEC = 100;
}
if ((gModeSelection == TIME_TRIALS) && (gActiveScreenMode == 0)) {
if ((gModeSelection == TIME_TRIALS) && (gActiveScreenMode == SCREEN_MODE_1P)) {
if ((D_80162DD4 == 0) && (gLapCountByPlayerId[4] != 3)) {
func_800057DC(); //gModeSelection, &D_80162DDC, 3, &D_80162DD4);
}
@ -586,7 +586,7 @@ void func_80005B18(void) {
{
D_80162DEC = 100;
}
if ((gModeSelection == 1) && (gActiveScreenMode == 0))
if ((gModeSelection == TIME_TRIALS) && (gActiveScreenMode == SCREEN_MODE_1P))
{
if ((D_80162DD4 == 0) && (gLapCountByPlayerId[1] != 3))
{

View File

@ -1,5 +1,6 @@
#include "textures.h"
// 0x801978D0
MkTexture D_02000000[2] = {
{3, 0, gTextureTinyFont0, 8, 8, 0, 0, 0x75, 0},
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
@ -2341,21 +2342,24 @@ MkTexture D_02004660[2] = {
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
};
// 0x8019BF58 first colone one player
MkTexture D_02004688[4] = {
{1, 0, gTextureMenu1PGame, 64, 54, 0, 0, 0x0, 0},
{1, 0, gTextureMenuModeMarioGP, 64, 18, 0, 65, 0x0, 0},
{1, 0, gTextureMenu1PGame, 64, 54, 0, 0, 0x0, 0}, // 0x8019BF58
{1, 0, gTextureMenuModeMarioGP, 64, 18, 0, 65, 0x0, 0}, // 0x8019BF6C
{1, 0, gTextureMenuModeTimeTrials, 64, 18, 0, 83, 0x0, 0},
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
};
// 0x8019BFA8 second colone two player
MkTexture D_020046D8[5] = {
{1, 0, gTextureMenu2PGame, 64, 54, 0, 0, 0x0, 0},
{1, 0, gTextureMenu2PGame, 64, 54, 0, 0, 0x0, 0}, // 0x8019BFA8
{1, 0, gTextureMenuModeMarioGP, 64, 18, 0, 65, 0x0, 0},
{1, 0, gTextureMenuModeVS, 64, 18, 0, 83, 0x0, 0},
{1, 0, gTextureMenuModeBattle, 64, 18, 0, 101, 0x0, 0},
{0, 0, NULL, 0, 0, 0, 0, 0, 0},
};
// 0x8019C00C third colone three player
MkTexture D_0200473C[4] = {
{1, 0, gTextureMenu3PGame, 64, 54, 0, 0, 0x0, 0},
{1, 0, gTextureMenuModeVS, 64, 18, 0, 65, 0x0, 0},
@ -3556,6 +3560,8 @@ MkAnimation D_02006BB0[11] = {
{ NULL, 0x00000000},
};
// bowser animation
MkAnimation D_02006C08[21] = {
{D_02006488, 0x00000001},
{D_020064B0, 0x00000001},

View File

@ -0,0 +1,147 @@
import os
import re
import argparse
parser = argparse.ArgumentParser(description='Actualise type in C code')
parser.add_argument('-k', '--know_the_unknow', action='store_true', help='replace ? by type if is found somewhere')
parser.add_argument('-cv', "--change_var_name", action='store_true', help='change var name')
parser.add_argument("-cf", "--change_type_var", action='store_true', help="change type of var")
arg = parser.parse_args()
root = "."
var:dict[str,str] = {}
number_type_var = {}
ban_type = [
"extern",
"struct",
"static",
"UNUSED",
"?",
"include",
"const",
"case",
"ALIGNED8",
"typedef"
]
static = {}
def check_file_and_folder(path:str, name:str) -> bool:
if not (name.endswith(".c") or name.endswith(".h")):
return True
if "tools" in path:
return True
return False
def replace_type(var_name: str, var_type: str, chn: str) -> str:
if var_name in chn:
result = re.sub(rf"(?! )\w+ {var_name}", f"{var_type} {var_name}", chn)
result = re.sub(rf"(?! )\? {var_name}", f"{var_type} {var_name}", chn)
else:
result = chn
return result
def find_type(prefix = ""):
for path, subdirs, files in os.walk(root):
for name in files:
if check_file_and_folder(path, name):
continue
print(os.path.join(path, name))
with open(os.path.join(path, name)) as f:
data = f.read()
if prefix=="":
result = re.findall(r'\n(\w+) (\w+)', data)
else:
result = re.findall(r'\n'+prefix+r' (\w+) (\w+)', data)
for i in result:
if i[1] == "//" or (i[0] in ban_type) or len(i[1])<1:
continue
var[i[1]] = i[0]
if i[0] in number_type_var:
number_type_var[i[0]] += 1
else:
number_type_var[i[0]] = 1
def know_the_unknow():
find_type()
find_type("static")
find_type("const")
find_type("struct")
find_type("extern")
print(var)
for path, subdirs, files in os.walk(root):
for name in files:
if check_file_and_folder(path, name):
continue
print(os.path.join(path, name))
with open(os.path.join(path, name), "r+") as f:
data = f.read()
for i in var:
data = replace_type(i, var[i], data)
f.seek(0)
f.write(data)
def change_var_name():
old_name = input("Old name: ")
new_name = input("New name: ")
for path, subdirs, files in os.walk(root):
for name in files:
if check_file_and_folder(path, name):
continue
print(os.path.join(path, name))
with open(os.path.join(path, name), "r+") as f:
data = f.read()
data = data.replace(old_name, new_name)
f.seek(0)
f.write(data)
def change_type_var():
name_var = input("Name var: ")
new_type = input("New type: ")
for path, subdirs, files in os.walk(root):
for name in files:
if check_file_and_folder(path, name):
continue
print(os.path.join(path, name))
with open(os.path.join(path, name), "r+") as f:
data = f.read()
data = replace_type(name_var, new_type, data)
f.seek(0)
f.write(data)
def main():
if arg.know_the_unknow:
print("actualise type")
know_the_unknow()
elif arg.change_var_name:
change_var_name()
elif arg.change_type_var:
change_type_var()
if __name__ == "__main__":
main()