diff --git a/src/actors.c b/src/actors.c index 30ee14cd0..d0754c9f2 100644 --- a/src/actors.c +++ b/src/actors.c @@ -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) { diff --git a/src/audio/effects.c b/src/audio/effects.c index cfaa049e6..f12a4c0e4 100644 --- a/src/audio/effects.c +++ b/src/audio/effects.c @@ -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; diff --git a/src/audio/external.c b/src/audio/external.c index b52182a29..7c07c8d54 100644 --- a/src/audio/external.c +++ b/src/audio/external.c @@ -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) { diff --git a/src/audio/heap.c b/src/audio/heap.c index a4eed127d..e64902a89 100644 --- a/src/audio/heap.c +++ b/src/audio/heap.c @@ -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; diff --git a/src/audio/load.c b/src/audio/load.c index 22031fbda..a07be1a96 100644 --- a/src/audio/load.c +++ b/src/audio/load.c @@ -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; diff --git a/src/audio/playback.c b/src/audio/playback.c index b3c127225..b40c73600 100644 --- a/src/audio/playback.c +++ b/src/audio/playback.c @@ -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; diff --git a/src/audio/port_eu.c b/src/audio/port_eu.c index a4990188d..8d156e570 100644 --- a/src/audio/port_eu.c +++ b/src/audio/port_eu.c @@ -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) { diff --git a/src/audio/seqplayer.c b/src/audio/seqplayer.c index 8ba7ec12a..7424e86f6 100644 --- a/src/audio/seqplayer.c +++ b/src/audio/seqplayer.c @@ -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; diff --git a/src/audio/synthesis.c b/src/audio/synthesis.c index 11602ee5d..8106fb622 100644 --- a/src/audio/synthesis.c +++ b/src/audio/synthesis.c @@ -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; diff --git a/src/camera.c b/src/camera.c index e703fbb60..aa795fb51 100644 --- a/src/camera.c +++ b/src/camera.c @@ -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)) { diff --git a/src/code_80004740.c b/src/code_80004740.c index 489537e62..1af9f3f5a 100644 --- a/src/code_80004740.c +++ b/src/code_80004740.c @@ -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; diff --git a/src/code_80005FD0.c b/src/code_80005FD0.c index 4891129f7..d0f7f5f4f 100644 --- a/src/code_80005FD0.c +++ b/src/code_80005FD0.c @@ -130,9 +130,9 @@ s32 func_800061DC(Vec3f arg0, f32 arg1, s32 arg2) { #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -extern ? D_80163258; -extern ? D_80163270; -extern ? D_80163288; +extern s16 D_80163258; +extern s16 D_80163270; +extern s32 D_80163288; void func_800065D0(s32 arg0, Player *player) { Player *temp_a3; @@ -180,8 +180,8 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800065D0.s") extern s16 D_8016348C; extern ? D_80164378; extern ? D_801643D8; -extern ? D_801643E0; -extern ? D_80164408; +extern s32 D_801643E0; +extern s32 D_80164408; extern s8 D_8018EDF3; void set_places(void) { @@ -306,10 +306,9 @@ void set_places(void) { void *var_a2_3; void *var_a2_4; - temp_v0 = gModeSelection; - switch (temp_v0) { /* irregular */ - case 0: - case 1: + switch (gModeSelection) { /* irregular */ + case GRAND_PRIX: + case TIME_TRIALS: var_t4 = 8; block_7: if (D_8016348C == 0) { @@ -685,9 +684,9 @@ block_80: } while (var_t3_3 != var_t4); } } - case 3: + case BATTLE: return; - case 2: + case VERSUS: var_t4 = D_8018EDF3; goto block_7; } @@ -699,7 +698,7 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/set_places.s") #ifdef MIPS_TO_C //generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9 extern ? D_801643D8; -extern ? D_801643E0; +extern s32 D_801643E0; extern s8 D_8018EDF3; void func_800070F4(void) { @@ -760,10 +759,9 @@ void func_800070F4(void) { s8 var_a2; void *temp_t3_3; - temp_v0 = gModeSelection; - switch (temp_v0) { /* irregular */ - case 0: - case 1: + switch (gModeSelection) { /* irregular */ + case GRAND_PRIX: + case TIME_TRIALS: var_a2 = 8; block_7: var_a3 = 0; @@ -926,9 +924,9 @@ block_35: } while (var_a3_3 != var_a2); } } - case 3: + case BATTLE: return; - case 2: + case VERSUS: var_a2 = D_8018EDF3; goto block_7; } @@ -940,7 +938,7 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800070F4.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de extern ? D_801643D8; -extern ? D_801643E0; +extern s32 D_801643E0; void func_800074D4(void) { ? *var_v0_4; @@ -1263,7 +1261,7 @@ s32 func_80007BF8(u16 arg0, u16 arg1, u16 arg2, u16 arg3, u16 arg4) { #ifdef MIPS_TO_C //generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9 -extern ? D_801631E0; +extern s16 D_801631E0; extern u16 D_80163344; extern s16 D_80163478; extern ? D_801634C0; @@ -1459,12 +1457,12 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80007FA4.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_80007D04(f32, s32, Player *, s32, Player *); /* extern */ -? func_80007FA4(f32, Player *, f32, Player *); /* extern */ +void func_80007D04(f32, s32, Player *, s32, Player *); /* extern */ +void func_80007FA4(f32, Player *, f32, Player *); /* extern */ s32 func_800088D8(f32, s32, s16, s16, Player *); /* extern */ -extern ? D_801631E0; -extern ? D_80163330; -extern ? D_80163350; +extern s16 D_801631E0; +extern u16 D_80163330; +extern s16 D_80163350; extern ? D_801634D8; extern ? D_80164392; extern ? D_8016440A; @@ -1505,13 +1503,13 @@ void func_80008424(s32 arg0, f32 arg1, Player *player) { temp_v0_2 = gCCSelection; var_f0 = 3.3333333f; switch (temp_v0_2) { /* irregular */ - case 1: - case 3: + case CC_100: + case CC_EXTRA: break; - case 0: + case CC_50: var_f0 = 2.5f; break; - case 2: + case CC_150: var_f0 = 3.75f; break; } @@ -1607,11 +1605,11 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80008424.s") #ifdef MIPS_TO_C //generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9 -extern ? D_80163128; -extern ? D_80163150; -extern ? D_80163330; +extern s32 D_80163128; +extern s32 D_80163150; +extern u16 D_80163330; extern s16 D_80163344; -extern ? D_80163348; +extern u16 D_80163348; extern s16 D_80163478; extern ? D_80164376; extern s16 D_80164386; @@ -1686,7 +1684,7 @@ s32 func_800088D8(s32 arg0, s16 arg1, s16 arg2) { temp_t4 = temp_t0 + &D_80163150; *temp_t5 = -1; *temp_t4 = -1; - if (gModeSelection == 1) { + if (gModeSelection == TIME_TRIALS) { return 1; } if (var_a1 < 0) { @@ -1928,13 +1926,13 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80009258.s") #ifdef MIPS_TO_C //generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9 -? func_800065D0(s32, Player *, s32 *); /* extern */ +void func_800065D0(s32, Player *, s32 *); /* extern */ f32 func_80009258(s32, f32, f32, u16 *); /* extern */ -? func_80011AE4(s32); /* extern */ +void func_80011AE4(s32); /* extern */ extern s16 D_801630E0; extern s16 D_801630E2; extern ? D_80163240; -extern ? D_80163450; +extern f32 D_80163450; extern s16 D_80163478; extern s16 D_8016348C; extern s16 D_801634EC; @@ -2046,7 +2044,7 @@ block_25: if (temp_f0_2 < sp38) { temp_t1 = *temp_v0_2 + 1; *temp_v0_2 = temp_t1; - if ((gModeSelection == 0) && (temp_t1 == 5)) { + if ((gModeSelection == GRAND_PRIX) && (temp_t1 == 5)) { var_v0 = gLapCountByPlayerId; if (*(&D_80164408 + var_a3) == 7) { do { @@ -2095,7 +2093,7 @@ block_25: temp_v0_5 = player->unk_000; if (((temp_v0_5 & 0x4000) != 0) && ((temp_v0_5 & 0x1000) == 0)) { func_800065D0(playerId, player, &D_80163448); - if ((gModeSelection == 0) && (D_8018EDF3 == 2) && (playerId == 0)) { + if ((gModeSelection == GRAND_PRIX) && (D_8018EDF3 == 2) && (playerId == 0)) { if (D_80164408 < D_8016440C) { D_80163478 = 0; } else { @@ -2149,9 +2147,9 @@ void func_800097E0(void) { #ifdef MIPS_TO_C //generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9 -? func_800C92CC(u8, ?, s16 *, Player *); /* extern */ -extern ? D_80163398; -extern ? D_801633B0; +void func_800C92CC(u8, ?, s16 *, Player *); /* extern */ +extern s16 D_80163398; +extern s16 D_801633B0; void func_800098FC(u8 arg0, Player *player) { s32 sp1C; @@ -2183,11 +2181,11 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800098FC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800C92CC(s32, ?); // extern -extern ? D_80163398; -extern ? D_801633B0; -extern ? D_801633C8; -extern ? D_801643E0; +void func_800C92CC(s32, ?); // extern +extern s16 D_80163398; +extern s16 D_801633B0; +extern s16 D_801633C8; +extern s32 D_801643E0; void func_800099EC(s32 arg0, ? arg1) { s32 sp40; @@ -2251,50 +2249,50 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800099EC.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80008424(s32, ?32, Player *); /* extern */ -? func_8000929C(s32, Player *); /* extern */ -? func_800099EC(s32, Player *); /* extern */ -? func_8000B140(s32); /* extern */ -? func_8000BBD8(s32, ?32, s16, f32 *); /* extern */ -? func_8000D3B8(s32); /* extern */ -? func_8000D438(s32, u16); /* extern */ -? func_80011E38(s32); /* extern */ -? func_80012DC0(s32, Player *); /* extern */ -? func_80013054(); /* extern */ -? func_800131DC(s32); /* extern */ -? func_80013854(Player *); /* extern */ -? func_8001AC10(s32); /* extern */ -? func_8003680C(Player *, s16, Player *, s16, Player *); /* extern */ -? set_places(); /* extern */ -extern ? D_0D009418; -extern ? D_0D009568; -extern ? D_0D0096B8; -extern ? D_0D009808; +void func_80008424(s32, ?32, Player *); /* extern */ +void func_8000929C(s32, Player *); /* extern */ +void func_800099EC(s32, Player *); /* extern */ +void func_8000B140(s32); /* extern */ +void func_8000BBD8(s32, ?32, s16, f32 *); /* extern */ +f32 func_8000D3B8(s32); /* extern */ +void func_8000D438(s32, u16); /* extern */ +void func_80011E38(s32); /* extern */ +void func_80012DC0(s32, Player *); /* extern */ +void func_80013054(); /* extern */ +void func_800131DC(s32); /* extern */ +void func_80013854(Player *); /* extern */ +void func_8001AC10(s32); /* extern */ +void func_8003680C(Player *, s16, Player *, s16, Player *); /* extern */ +void set_places(); /* extern */ +extern f32 D_0D009418; +extern f32 D_0D009568; +extern f32 D_0D0096B8; +extern f32 D_0D009808; extern s16 D_8015F6E8; extern s16 D_8015F6EA; extern s16 D_8015F6F0; extern s16 D_8015F6F2; extern f32 D_80162FA0; extern s16 D_80162FD0; -extern ? D_80162FF8; -extern ? D_80163028; -extern ? D_80163050; -extern ? D_80163090; +extern s16 D_80162FF8; +extern f32 D_80163028; +extern s16 D_80163050; +extern f32 D_80163090; extern ? D_801630B8; extern u16 D_801630E0; extern s16 D_801630E2; -extern ? D_801630E8; -extern ? D_80163100; -extern ? D_80163178; -extern ? D_801631A0; -extern ? D_801631E0; -extern ? D_801631F8; +extern s16 D_801630E8; +extern s32 D_80163100; +extern f32 D_80163178; +extern f32 D_801631A0; +extern s16 D_801631E0; +extern s16 D_801631F8; extern ?32 D_8016320C; -extern ? D_80163210; +extern f32 D_80163210; extern ? D_80163240; -extern ? D_801632E8; +extern s16 D_801632E8; extern ? D_80163300; -extern ? D_80163330; +extern u16 D_80163330; extern ? D_8016334C; extern s32 D_80163378; extern ? D_801633E0; @@ -2492,11 +2490,11 @@ void func_80009B60(s32 playerId) { temp_v0_5 = gModeSelection; D_80162FD0 = 0; switch (temp_v0_5) { /* switch 1; irregular */ - case 1: /* switch 1 */ - case 2: /* switch 1 */ - case 3: /* switch 1 */ + case TIME_TRIALS: /* switch 1 */ + case VERSUS: /* switch 1 */ + case BATTLE: /* switch 1 */ break; - case 0: /* switch 1 */ + case GRAND_PRIX: /* switch 1 */ break; } temp_a1 = sp34 + &D_801631E0; @@ -2818,10 +2816,10 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80009B60.s") #ifdef MIPS_TO_C //generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9 -extern ? D_80162FF8; -extern ? D_80163010; -extern ? D_80163090; -extern ? D_801630E8; +extern s16 D_80162FF8; +extern s16 D_80163010; +extern f32 D_80163090; +extern s16 D_801630E8; void func_8000B140(s32 playerId) { s32 spFC; @@ -3099,7 +3097,7 @@ void func_8000B95C(s32 playerId, u16 wayPointIndex, s32 pathIndex) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern f32 D_800ECFE4; -extern ? D_80162FA0; +extern f32 D_80162FA0; extern f32 D_80162FA8; extern u16 D_80164430; @@ -3481,7 +3479,7 @@ s16 func_8000CC88(f32 posX, f32 posY, f32 posZ, Player *player, s32 playerId, s3 #ifdef MIPS_TO_C //generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9 -extern ? D_801631E0; +extern s16 D_801631E0; extern s32 D_80163488; s16 func_8000CD24(f32 posX, f32 posY, f32 posZ, s16 wayPointIndex, Player *player, s32 playerId, s32 pathIndex) { @@ -3719,10 +3717,10 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8000D3B8.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000BBD8(s32, f32, s16, u16); /* extern */ +void func_8000BBD8(s32, f32, s16, u16); /* extern */ f32 func_8000D3B8(s32, u16); /* extern */ -extern ? D_80162FA0; -extern ? D_80163380; +extern f32 D_80162FA0; +extern s16 D_80163380; extern s16 D_8016344A; s16 gCurrentCourseId; /* unable to generate initializer */ @@ -3807,8 +3805,8 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8000D438.s") #ifdef MIPS_TO_C //generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9 -? func_8000BBD8(u16, s32, s16, u16); /* extern */ -extern ? D_80162FA0; +void func_8000BBD8(u16, s32, s16, u16); /* extern */ +extern f32 D_80162FA0; void func_8000D6D0(Vec3f arg0, s16 *wayPointIndex, f32 arg2, s32 arg3, s16 pathIndex, s16 arg5) { s16 spA0; @@ -3884,8 +3882,8 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8000D6D0.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000BBD8(u16, s32, s16, s32); /* extern */ -extern ? D_80162FA0; +void func_8000BBD8(u16, s32, s16, s32); /* extern */ +extern f32 D_80162FA0; void func_8000D940(Vec3f arg0, s16 *arg1, f32 arg2, s32 arg3, s16 pathIndex) { s16 spA8; @@ -4109,7 +4107,7 @@ extern f32 D_80162FC0; extern s16 D_8016347C; extern s16 D_8016347E; extern ? D_80163DE8; -extern ? D_80164038; +extern UnkActorInner D_80164038; extern u16 D_8016443E; extern s32 D_8016455C; extern u16 D_801645CE; @@ -4523,7 +4521,7 @@ void func_8000EEDC(void) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80076D70(void *, f32, s16); // extern +void func_80076D70(void *, f32, s16); // extern extern f32 D_800ED040; extern f32 D_800ED044; extern f32 D_800ED048; @@ -4745,19 +4743,19 @@ struct _struct_D_800DD9D0_0x10 { /* 0x0A */ char padA[6]; /* maybe part of unk8[4]? */ }; /* size = 0x10 */ -? func_8000DD78(); /* extern */ -? func_8000EEDC(); /* extern */ -? func_8000F2BC(struct TrackWayPoint *, s32); /* extern */ -? func_800100F0(s32); /* extern */ -? func_80010E6C(s32); /* extern */ -? func_800120C8(); /* extern */ -? func_80012190(); /* extern */ -? func_800127E0(); /* extern */ -? func_800132F4(); /* extern */ -? func_800147E0(); /* extern */ -? func_80014934(); /* extern */ -? func_80014A88(); /* extern */ -? func_80014BDC(); /* extern */ +void func_8000DD78(); /* extern */ +void func_8000EEDC(); /* extern */ +void func_8000F2BC(struct TrackWayPoint *, s32); /* extern */ +void func_800100F0(s32); /* extern */ +void func_80010E6C(s32); /* extern */ +void func_800120C8(); /* extern */ +void func_80012190(); /* extern */ +void func_800127E0(); /* extern */ +void func_800132F4(); /* extern */ +void func_800147E0(); /* extern */ +void func_80014934(); /* extern */ +void func_80014A88(); /* extern */ +void func_80014BDC(); /* extern */ extern s32 D_80163598; static struct _struct_D_800DD9D0_0x10 D_800DD9D0[0]; /* unable to generate initializer */ s16 gCurrentCourseId; /* unable to generate initializer */ @@ -4873,10 +4871,10 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8000F2DC.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_80011A5C(); /* extern */ -? func_80011AB8(s32, s32); /* extern */ -? func_8001AB00(? *, s16, u16 *, u16); /* extern */ -extern ? D_0D009418; +void func_80011A5C(); /* extern */ +void func_80011AB8(s32, s32); /* extern */ +void func_8001AB00(? *, s16, u16 *, u16); /* extern */ +extern f32 D_0D009418; extern ? D_80162F10; extern ? D_80162F50; extern ? D_80162F8C; @@ -4924,7 +4922,7 @@ extern s16 D_801634EC; extern s32 D_801634F0; extern s32 D_801634F4; extern ? D_801634F8; -extern ? D_801637BC; +extern u16 D_801637BC; extern s16 D_80164358; extern u16 D_8016435A; extern u16 D_8016435C; @@ -5133,7 +5131,7 @@ void func_8000F628(void) { *spD0 = -1; *spCC = 0.0f; *spC8 = 0.0f; - if (gModeSelection == 0) { + if (gModeSelection == GRAND_PRIX) { temp_v0 = *(var_fp + D_80165270); *var_s4 = (s32) temp_v0; *var_s6 = (s32) temp_v0; @@ -5247,7 +5245,7 @@ void func_8000F628(void) { if (D_800DC51C == 0) { var_v0 = &D_80163344; var_s0_2 = 0; - if (gModeSelection == 0) { + if (gModeSelection == GRAND_PRIX) { var_a0 = &D_80163348; do { temp_t7 = *var_a0; @@ -5268,7 +5266,7 @@ void func_8000F628(void) { var_s2_2 += 2; var_s2_2->unk-2 = 0; } while ((u32) var_s2_2 < (u32) &D_80163340); - if (gModeSelection == 2) { + if (gModeSelection == VERSUS) { temp_t6 = cameras->playerId; temp_v1_3 = temp_t6 & 0xFFFF; (&D_80163330)[temp_v1_3] = 1; @@ -5302,7 +5300,7 @@ void func_8000F628(void) { } while ((u32) var_v1 < (u32) &D_80164448); D_8016347A = 0; var_v1_2 = &D_80162F10; - if (gCCSelection == 3) { + if (gCCSelection == CC_EXTRA) { D_8016347A = 1; } var_v0_4 = &D_80162F50; @@ -6055,18 +6053,18 @@ void func_80011AE4(s32 index) { #ifdef MIPS_TO_C //generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9 -? func_80011AB8(u16, u16 *); /* extern */ -? func_80011EC0(s32, u16); /* extern */ -? func_8002AA50(Player *, u16, u16 *); /* extern */ +void func_80011AB8(u16, u16 *); /* extern */ +void func_80011EC0(s32, u16); /* extern */ +void func_8002AA50(Player *, u16, u16 *); /* extern */ extern ? D_80162EB8; -extern ? D_801630E8; -extern ? D_801631E0; +extern s16 D_801630E8; +extern s16 D_801631E0; extern void *D_801632B0; -extern ? D_801632B8; -extern ? D_801632D0; -extern ? D_801632E8; -extern ? D_80163350; -extern ? D_801633F8; +extern s16 D_801632B8; +extern s16 D_801632D0; +extern s16 D_801632E8; +extern s16 D_80163350; +extern s16 D_801633F8; extern ? D_801634FC; s16 gCurrentCourseId; /* unable to generate initializer */ @@ -6152,11 +6150,11 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80011B14.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 extern ? D_80162EB8; -extern ? D_801630E8; -extern ? D_801632D0; -extern ? D_801632E8; +extern s16 D_801630E8; +extern s16 D_801632D0; +extern s16 D_801632E8; extern ? D_801634F8; -extern ? gNearestWaypointByPlayerId; +extern u16 gNearestWaypointByPlayerId; s16 gCurrentCourseId; /* unable to generate initializer */ void func_80011D48(s32 arg0, void *arg1) { @@ -6204,9 +6202,9 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80011D48.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80011B14(Player *); // extern -? func_80011D48(Player *); // extern -extern ? D_801632E8; +void func_80011B14(Player *); // extern +void func_80011D48(Player *); // extern +extern s16 D_801632E8; void func_80011E38(s32 arg0) { Player *temp_a1; @@ -6232,9 +6230,9 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80011E38.s") #ifdef MIPS_TO_C //generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9 -? func_8002AA50(Player *, s16 *, s32); /* extern */ -extern ? D_80162FF8; -extern ? D_801630E8; +void func_8002AA50(Player *, s16 *, s32); /* extern */ +extern s16 D_80162FF8; +extern s16 D_801630E8; void func_80011EC0(s32 arg0, Player *player, s32 arg2, s32 arg3) { s16 *sp1C; @@ -6293,7 +6291,7 @@ extern ? D_06006C60; extern s16 D_80162EB0; extern void *D_80163598; extern s32 D_8016359C; -extern ? gSegmentTable; +extern uintptr_t gSegmentTable; void func_800120C8(void) { void *sp18; @@ -6327,7 +6325,7 @@ extern ? D_06007520; extern s16 D_80162EB2; extern s32 D_80163598; extern s32 D_8016359C; -extern ? gSegmentTable; +extern uintptr_t gSegmentTable; void func_80012190(void) { u16 *temp_a1; @@ -6489,7 +6487,7 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80012780.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80012780(TrainStuff *, s32, s32); /* extern */ +void func_80012780(TrainStuff *, s32, s32); /* extern */ extern s16 D_80162FCC; extern s32 D_80163598; extern s32 D_8016359C; @@ -6602,7 +6600,7 @@ void func_80012A48(TrainCarStuff *trainCar, s16 arg1) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800755FC(s32, f32 *, f32); /* extern */ +s32 func_800755FC(s32, f32 *, f32); /* extern */ extern s16 D_80162FCC; extern f32 D_801635A4; extern s16 D_801635BC; @@ -6705,7 +6703,7 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80012AC0.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_801631E0; +extern s16 D_801631E0; void func_80012DC0(s32 playerId, Player *player) { f32 sp84; @@ -6830,7 +6828,7 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80013054.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_801631E0; +extern s16 D_801631E0; extern ? D_801634D8; extern u16 D_801637BC; extern u16 D_801637BE; @@ -7121,14 +7119,14 @@ void func_800139E4(f32 arg0, f32 arg1, s32 arg2, s32 arg3, VehicleStuff *vehicle var_s0->someFlags = 0; var_s0->someFlagsTheSequel = 0; var_s0->position[2] = (f32) temp_v0->wayPointZ; - if (gModeSelection == 1) { + if (gModeSelection == TIME_TRIALS) { var_s0->someType = (s16) (var_s3 % 3); } else { var_s0->someType = random_int(3U); } temp_v0_2 = var_s0->someType; var_s0->someMultiplierTheSequel = (f32) ((f64) (f32) (temp_v0_2 - 1) * 0.6); - if (((gCCSelection > 0) || (gModeSelection == 1)) && (temp_v0_2 == 2)) { + if (((gCCSelection > 0) || (gModeSelection == TIME_TRIALS)) && (temp_v0_2 == 2)) { var_s0->someMultiplier = arg0; } else { var_s0->someMultiplier = arg1; @@ -7269,10 +7267,10 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80013D20.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_800C9EF4(f32 *, u32); /* extern */ +void func_800C9EF4(f32 *, u32); /* extern */ extern s16 D_801631C8; -extern ? D_801631E0; -extern ? D_80163270; +extern s16 D_801631E0; +extern s16 D_80163270; extern s16 D_8016347A; void func_80013F7C(s32 playerId, Player *player, VehicleStuff *vehicle, f32 arg3, f32 arg4, s32 arg5, u32 arg6) { @@ -7565,11 +7563,11 @@ void func_8001490C(s32 playerId) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800139E4(f32, f32, ?, ?, ? *, s16 *); // extern +void func_800139E4(f32, f32, ?, ?, ? *, s16 *); // extern extern f64 D_800ED1D0; extern f64 D_800ED1D8; extern f64 D_800ED1E0; -extern ? gSchoolBusList; +extern VehicleStuff gSchoolBusList; void func_80014934(void) { f64 temp_f0; @@ -7603,11 +7601,11 @@ void func_80014A60(s32 playerId) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800139E4(f32, f32, ?, ?, ? *, s16 *); // extern +void func_800139E4(f32, f32, ?, ?, ? *, s16 *); // extern extern f64 D_800ED1E8; extern f64 D_800ED1F0; extern f64 D_800ED1F8; -extern ? gTankerTruckList; +extern VehicleStuff gTankerTruckList; void func_80014A88(void) { f64 temp_f0; @@ -7641,11 +7639,11 @@ void func_80014BB4(s32 playerId) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800139E4(f32, f32, ?, ?, ? *, s16 *); // extern +void func_800139E4(f32, f32, ?, ?, ? *, s16 *); // extern extern f64 D_800ED200; extern f64 D_800ED208; extern f64 D_800ED210; -extern ? gCarList; +extern VehicleStuff gCarList; void func_80014BDC(void) { f64 temp_f0; @@ -7690,9 +7688,9 @@ void func_80014D30(s32 cameraId, s32 pathIndex) { //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern s32 D_80163238; extern s16 gNearestWaypointByCameraId; -extern ? D_80164670; -extern ? D_80164678; -extern ? D_80164680; +extern s16 D_80164670; +extern s16 D_80164678; +extern s16 D_80164680; extern ? D_801646C0; extern s32 D_801646C8; extern s16 D_801646CC; @@ -7742,7 +7740,7 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80014DE4.s") #ifdef MIPS_TO_C //generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9 extern ? D_80164498; -extern ? D_80164678; +extern s16 D_80164678; f32 func_80014EE4(f32 arg0, s32 arg1) { f32 temp_f0; @@ -7900,7 +7898,7 @@ UNUSED void func_8001530C(void) { #ifdef NON_MATCHING //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -//? func_80015390(Camera *, Player *, ?, s32); /* extern */ +//void func_80015390(Camera *, Player *, ?, s32); /* extern */ void func_80015390(Camera*, Player*, s32,s32); void func_80015314(s32 playerId, s32 arg1, s32 cameraId) { Camera *temp_a0 = &camera1[cameraId]; @@ -7917,7 +7915,7 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80015314.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8001D794(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, s32); /* extern */ +void func_8001D794(Player *, Camera *, f32 *, f32 *, f32 *, f32 *, s32); /* extern */ void func_80015390(Camera *camera, s32 arg1, s32 arg2) { f32 sp94; @@ -7970,8 +7968,8 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80015390.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000BBD8(f32, s32, f32, s16); /* extern */ -extern ? D_80162FA0; +void func_8000BBD8(f32, s32, f32, s16); /* extern */ +extern f32 D_80162FA0; extern ? D_801645F8; extern ? D_80164618; extern ? D_80164638; @@ -8034,12 +8032,12 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80015544.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_80014D30(s32, s32); /* extern */ -? func_8001A348(s32, s32, s16); /* extern */ +void func_80014D30(s32, s32); /* extern */ +void func_8001A348(s32, s32, s16); /* extern */ extern ? D_801645F8; extern ? D_80164618; extern ? D_80164638; -extern ? D_80164680; +extern s16 D_80164680; extern ? D_80164688; void func_8001577C(Camera *camera, s32 arg1, s32 arg2, s32 arg3) { @@ -8130,8 +8128,8 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001577C.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000BBD8(f32, s32, f32, s16, s16); /* extern */ -extern ? D_80162FA0; +void func_8000BBD8(f32, s32, f32, s16, s16); /* extern */ +extern f32 D_80162FA0; extern ? D_801645F8; extern ? D_80164618; extern ? D_80164638; @@ -8188,16 +8186,16 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80015A9C.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000BBD8(u16, s32, u16, s16, s32 *); /* extern */ -? func_80014D30(s32, s32); /* extern */ -? func_8001A348(s32, s32, s16, s32 *, s32 *); /* extern */ -extern ? D_80162FA0; +void func_8000BBD8(u16, s32, u16, s16, s32 *); /* extern */ +void func_80014D30(s32, s32); /* extern */ +void func_8001A348(s32, s32, s16, s32 *, s32 *); /* extern */ +extern f32 D_80162FA0; extern s32 D_80163238; extern ? D_801645F8; extern ? D_80164618; extern ? D_80164638; extern ? D_80164648; -extern ? D_80164680; +extern s16 D_80164680; extern ? D_80164688; void func_80015C94(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) { @@ -8364,8 +8362,8 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80015C94.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000BBD8(f32, s32, f32, s16, s16); /* extern */ -extern ? D_80162FA0; +void func_8000BBD8(f32, s32, f32, s16, s16); /* extern */ +extern f32 D_80162FA0; extern ? D_801645F8; extern ? D_80164618; extern ? D_80164638; @@ -8419,17 +8417,17 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800162CC.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000BBD8(u16, f32, s16, u16, s16, s16); /* extern */ -? func_80014D30(s32, s32); /* extern */ -? func_8001A348(s32, f32, s16, ?, ?); /* extern */ -extern ? D_80162FA0; +void func_8000BBD8(u16, f32, s16, u16, s16, s16); /* extern */ +void func_80014D30(s32, s32); /* extern */ +void func_8001A348(s32, f32, s16, ?, ?); /* extern */ +extern f32 D_80162FA0; extern s32 D_80163238; extern ? D_801645F8; extern ? D_80164618; extern ? D_80164638; extern ? D_80164648; extern ? D_80164658; -extern ? D_80164680; +extern s16 D_80164680; extern ? D_80164688; void func_80016494(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) { @@ -8646,8 +8644,8 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80016494.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000BBD8(s32, ?32, ?32, s32); /* extern */ -extern ? D_80162FA0; +void func_8000BBD8(s32, ?32, ?32, s32); /* extern */ +extern f32 D_80162FA0; extern ? D_80163DD8; extern ? D_801645F8; extern ? D_80164618; @@ -8745,9 +8743,9 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80016C3C.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000BBD8(u16, s32, s16, s16); /* extern */ -? func_80014D30(s32, s32, f32 *); /* extern */ -extern ? D_80162FA0; +void func_8000BBD8(u16, s32, s16, s16); /* extern */ +void func_80014D30(s32, s32, f32 *); /* extern */ +extern f32 D_80162FA0; extern s32 D_80163238; extern ? D_80163DD8; extern ? D_801645F8; @@ -8921,8 +8919,8 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80017054.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000BBD8(s32, f32, s16, s16); /* extern */ -extern ? D_80162FA0; +void func_8000BBD8(s32, f32, s16, s16); /* extern */ +extern f32 D_80162FA0; extern ? D_801645F8; extern ? D_80164618; extern ? D_80164638; @@ -8978,17 +8976,17 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80017720.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000BBD8(u16, f32, s16, s32); /* extern */ -? func_80014D30(s32, s32, f32 *, f32 *); /* extern */ -? func_8001A348(s32, f32, s16); /* extern */ -extern ? D_80162FA0; +void func_8000BBD8(u16, f32, s16, s32); /* extern */ +void func_80014D30(s32, s32, f32 *, f32 *); /* extern */ +void func_8001A348(s32, f32, s16); /* extern */ +extern f32 D_80162FA0; extern s32 D_80163238; extern ? D_801645F8; extern ? D_80164618; extern ? D_80164638; extern ? D_80164648; extern ? D_80164658; -extern ? D_80164680; +extern s16 D_80164680; extern ? D_80164688; void func_800178F4(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) { @@ -9150,8 +9148,8 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800178F4.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000BBD8(s32, f32, s16, s16); /* extern */ -extern ? D_80162FA0; +void func_8000BBD8(s32, f32, s16, s16); /* extern */ +extern f32 D_80162FA0; extern ? D_801645F8; extern ? D_80164618; extern ? D_80164638; @@ -9209,17 +9207,17 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80017F10.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000BBD8(u16, f32, s16); /* extern */ -? func_80014D30(s32, s32, f32 *, f32 *); /* extern */ -? func_8001A348(s32, f32, s16); /* extern */ -extern ? D_80162FA0; +void func_8000BBD8(u16, f32, s16); /* extern */ +void func_80014D30(s32, s32, f32 *, f32 *); /* extern */ +void func_8001A348(s32, f32, s16); /* extern */ +extern f32 D_80162FA0; extern s32 D_80163238; extern ? D_801645F8; extern ? D_80164618; extern ? D_80164638; extern ? D_80164648; extern ? D_80164658; -extern ? D_80164680; +extern s16 D_80164680; extern ? D_80164688; void func_800180F0(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) { @@ -9384,8 +9382,8 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800180F0.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000BA14(s32, f32, ?, s16); /* extern */ -extern ? D_80162FA0; +void func_8000BA14(s32, f32, ?, s16); /* extern */ +extern f32 D_80162FA0; extern s32 D_8016448C; extern ? D_801645F8; extern ? D_80164618; @@ -9442,17 +9440,17 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80018718.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000BA14(u16, f32, ?, s16); /* extern */ -? func_80014D30(s32, s32); /* extern */ -? func_8001A348(s32, f32, s16); /* extern */ -extern ? D_80162FA0; +void func_8000BA14(u16, f32, ?, s16); /* extern */ +void func_80014D30(s32, s32); /* extern */ +void func_8001A348(s32, f32, s16); /* extern */ +extern f32 D_80162FA0; extern s32 D_80163238; extern s32 D_8016448C; extern ? D_801645F8; extern ? D_80164618; extern ? D_80164638; extern ? D_80164648; -extern ? D_80164680; +extern s16 D_80164680; extern ? D_80164688; void func_800188F4(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) { @@ -9669,8 +9667,8 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_800188F4.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000BBD8(f32, s32, f32, ?, s32); /* extern */ -extern ? D_80162FA0; +void func_8000BBD8(f32, s32, f32, ?, s32); /* extern */ +extern f32 D_80162FA0; extern ? D_801645F8; extern ? D_80164618; extern ? D_80164638; @@ -9734,12 +9732,12 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80019118.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_80014D30(s32, s32); /* extern */ -? func_8001A348(s32, s32, s16); /* extern */ +void func_80014D30(s32, s32); /* extern */ +void func_8001A348(s32, s32, s16); /* extern */ extern ? D_801645F8; extern ? D_80164618; extern ? D_80164638; -extern ? D_80164680; +extern s16 D_80164680; extern ? D_80164688; void func_8001933C(Camera *camera, s32 arg1, s32 arg2, s32 cameraId) { @@ -9830,7 +9828,7 @@ extern ? D_801645F8; extern ? D_80164618; extern ? D_80164638; extern ? D_80164648; -extern ? D_80164678; +extern s16 D_80164678; void func_8001969C(s32 arg0, s32 arg1, s32 cameraId, s32 arg3) { s16 *temp_v1; @@ -9853,7 +9851,7 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001969C.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_80014D30(s32, ?); /* extern */ +void func_80014D30(s32, ?); /* extern */ extern ? D_801645F8; extern ? D_80164618; extern ? D_80164638; @@ -9891,18 +9889,18 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80019760.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_80015314(?, s32); /* extern */ -? func_80015544(?, s32, u16); /* extern */ -? func_80015A9C(?, s32, s16); /* extern */ -? func_800162CC(?, s32, s16); /* extern */ -? func_80016C3C(?, s32); /* extern */ -? func_80017720(?, s32, s16); /* extern */ -? func_80017F10(?, s32, s16); /* extern */ -? func_80018718(?, s32, s16); /* extern */ -? func_80019118(?, s32, s16); /* extern */ -? func_8001969C(?, s32, s16); /* extern */ +void func_80015314(?, s32); /* extern */ +void func_80015544(?, s32, u16); /* extern */ +void func_80015A9C(?, s32, s16); /* extern */ +void func_800162CC(?, s32, s16); /* extern */ +void func_80016C3C(?, s32); /* extern */ +void func_80017720(?, s32, s16); /* extern */ +void func_80017F10(?, s32, s16); /* extern */ +void func_80018718(?, s32, s16); /* extern */ +void func_80019118(?, s32, s16); /* extern */ +void func_8001969C(?, s32, s16); /* extern */ extern ? D_80163DD8; -extern ? D_80164680; +extern s16 D_80164680; extern ? D_801646C0; void func_80019890(s16 playerId, s32 cameraId) { @@ -10052,10 +10050,10 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80019B50.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800C9060(s32, ?, s32, s32); // extern +void func_800C9060(s32, ?, s32, s32); // extern extern ? D_80164608; -extern ? D_80164670; -extern ? D_80164678; +extern s16 D_80164670; +extern s16 D_80164678; void func_80019C50(s32 arg0) { s32 sp20; @@ -10095,10 +10093,10 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80019C50.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800151A4(s32); // extern -? func_80019B50(s32, s32, s32); // extern +void func_800151A4(s32); // extern +void func_80019B50(s32, s32, s32); // extern extern s32 D_80163378; -extern ? gNearestWaypointByPlayerId; +extern u16 gNearestWaypointByPlayerId; void func_80019D2C(void *arg0, void *arg1, s32 arg2) { s32 sp1C; @@ -10150,10 +10148,10 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80019DF4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80019890(?, ?); // extern +void func_80019890(?, ?); // extern extern s16 D_80164670; extern s16 D_80164672; -extern ? D_80164678; +extern s16 D_80164678; extern s16 D_80164680; extern s16 D_80164682; @@ -10173,8 +10171,8 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_80019E58.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_80015314(s32, ?, s32); /* extern */ -extern ? D_80164670; +void func_80015314(s32, ?, s32); /* extern */ +extern s16 D_80164670; extern s16 D_80164678; extern s16 D_80164680; extern s32 gPlayerWinningIndex; @@ -10278,8 +10276,8 @@ void func_8001A0DC(s16 *arg0, Camera *arg1, Player *arg2, s8 arg3, s32 arg4) { #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_800CA270(); /* extern */ -extern ? D_80164680; +void func_800CA270(); /* extern */ +extern s16 D_80164680; void func_8001A124(s32 arg0, s32 arg1) { s32 temp_v0; @@ -10314,7 +10312,7 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001A124.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_80164680; +extern s16 D_80164680; void func_8001A220(s32 arg0, s32 arg1) { s16 *var_at; @@ -10363,9 +10361,9 @@ s32 func_8001A310(s32 arg0, s32 arg1) { #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_80019890(s32, s32); /* extern */ +void func_80019890(s32, s32); /* extern */ s16 func_8001A310(f32, s16, s32, s32); /* extern */ -extern ? D_80164680; +extern s16 D_80164680; extern ? D_80164688; void func_8001A348(s32 cameraId, f32 arg1, s32 arg2) { @@ -10386,8 +10384,8 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001A348.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80019890(f32, s16, s32, s16); // extern -extern ? D_80164680; +void func_80019890(f32, s16, s32, s16); // extern +extern s16 D_80164680; extern ? D_80164688; extern ? D_8016479E; @@ -10409,9 +10407,9 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001A3D8.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_80019890(s32, s32, s16 *, s32); /* extern */ +void func_80019890(s32, s32, s16 *, s32); /* extern */ s16 func_8001A310(s16, s32, s16 *, s32); /* extern */ -extern ? D_80164680; +extern s16 D_80164680; void func_8001A450(s32 playerId, s32 arg1, s32 arg2) { s32 sp24; @@ -10431,8 +10429,8 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001A450.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8001A450(s32, s32, s32); /* extern */ -extern ? D_80164680; +void func_8001A450(s32, s32, s32); /* extern */ +extern s16 D_80164680; void func_8001A518(s32 arg0, s32 arg1, s32 arg2) { switch (arg1) { /* irregular */ @@ -10455,27 +10453,27 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001A518.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800151A4(Camera *, s32); /* extern */ -? func_80015390(Camera *, u16 *, s8, s32); /* extern */ -? func_8001577C(Camera *, u16 *, s8, s32); /* extern */ -? func_80015C94(Camera *, u16 *, s8, s32); /* extern */ -? func_80016494(Camera *, u16 *, s8, s32); /* extern */ -? func_80017054(Camera *, u16 *, s8, s32); /* extern */ -? func_800178F4(Camera *, u16 *, s8, s32); /* extern */ -? func_800180F0(Camera *, u16 *, s8, s32); /* extern */ -? func_800188F4(Camera *, u16 *, s8, s32); /* extern */ -? func_8001933C(Camera *, u16 *, s8, s32); /* extern */ -? func_80019760(Camera *, u16 *, s8, s32); /* extern */ -? func_80019890(s32, s32); /* extern */ -? func_80019C50(s32); /* extern */ -? func_80019D2C(Camera *, u16 *, s32, s32); /* extern */ -? func_80019FB4(s32); /* extern */ -? func_8001A124(?, s32, s32); /* extern */ -? func_8001A220(?, s32, s32); /* extern */ -? func_8001A3D8(s32, ?, s16, s32); /* extern */ -? func_8001A450(s32, s32, s32, s32); /* extern */ -? func_8001A518(s32, s32, ?, s32); /* extern */ -extern ? D_80164680; +void func_800151A4(Camera *, s32); /* extern */ +void func_80015390(Camera *, u16 *, s8, s32); /* extern */ +void func_8001577C(Camera *, u16 *, s8, s32); /* extern */ +void func_80015C94(Camera *, u16 *, s8, s32); /* extern */ +void func_80016494(Camera *, u16 *, s8, s32); /* extern */ +void func_80017054(Camera *, u16 *, s8, s32); /* extern */ +void func_800178F4(Camera *, u16 *, s8, s32); /* extern */ +void func_800180F0(Camera *, u16 *, s8, s32); /* extern */ +void func_800188F4(Camera *, u16 *, s8, s32); /* extern */ +void func_8001933C(Camera *, u16 *, s8, s32); /* extern */ +void func_80019760(Camera *, u16 *, s8, s32); /* extern */ +void func_80019890(s32, s32); /* extern */ +void func_80019C50(s32); /* extern */ +void func_80019D2C(Camera *, u16 *, s32, s32); /* extern */ +void func_80019FB4(s32); /* extern */ +void func_8001A124(?, s32, s32); /* extern */ +void func_8001A220(?, s32, s32); /* extern */ +void func_8001A3D8(s32, ?, s16, s32); /* extern */ +void func_8001A450(s32, s32, s32, s32); /* extern */ +void func_8001A518(s32, s32, ?, s32); /* extern */ +extern s16 D_80164680; extern ? D_801646C0; extern u32 D_801646C8; extern u16 D_801646CC; @@ -10502,7 +10500,7 @@ void func_8001A588(s32 arg0, Camera *camera, u16 *arg2, s8 arg3, s32 arg4) { void *temp_v0_7; var_s0 = camera->playerId; - if (gModeSelection == 1) { + if (gModeSelection == TIME_TRIALS) { var_s0 = 0; } func_80019FB4(arg4); @@ -10515,8 +10513,8 @@ void func_8001A588(s32 arg0, Camera *camera, u16 *arg2, s8 arg3, s32 arg4) { } } temp_v0 = gModeSelection; - if ((temp_v0 != 3) && (*(&D_80164680 + (arg4 * 2)) == -1) && (*arg2 & 0x800) && (D_801646CC == 0) && (D_801646C8 == 0)) { - if (temp_v0 == 2) { + if ((temp_v0 != BATTLE) && (*(&D_80164680 + (arg4 * 2)) == -1) && (*arg2 & 0x800) && (D_801646CC == 0) && (D_801646C8 == 0)) { + if (temp_v0 == VERSUS) { func_8001A220(0, (s32) var_s0, arg4); } else { func_8001A124(0, (s32) var_s0, arg4); @@ -10544,7 +10542,7 @@ void func_8001A588(s32 arg0, Camera *camera, u16 *arg2, s8 arg3, s32 arg4) { if ((arg4 == 0) && ((temp_v0_4 = D_801646C8, (temp_v0_4 == 0x0000000A)) || (temp_v0_4 == 0x0000000B))) { func_8001A518((s32) var_s0, gPlayerPositions[var_s0], 0, arg4); } - if ((gModeSelection != 1) && (arg4 == 1) && ((temp_v0_5 = D_801646C8, (temp_v0_5 == 0x00000104)) || (temp_v0_5 == 0x00000105))) { + if ((gModeSelection != TIME_TRIALS) && (arg4 == 1) && ((temp_v0_5 = D_801646C8, (temp_v0_5 == 0x00000104)) || (temp_v0_5 == 0x00000105))) { var_v1 = 0; if (D_8018EDF3 == 2) { func_8001A518((s32) var_s0, gPlayerPositions[var_s0], 1, arg4); @@ -10651,7 +10649,7 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001AAAC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern ? D_801642D8; -extern ? D_80164358; +extern s16 D_80164358; void func_8001AB00(void) { ? *temp_v1; @@ -10734,14 +10732,14 @@ void func_8001ABEC(struct struct_801642D8 *arg0) { #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8001AB74(s32, void *, s32); /* extern */ -? func_8001ABE0(s32, void *, s32 *); /* extern */ -? func_8001ABEC(void *, s16); /* extern */ +void func_8001AB74(s32, void *, s32); /* extern */ +void func_8001ABE0(s32, void *, s32 *); /* extern */ +void func_8001ABEC(void *, s16); /* extern */ s32 func_8007AF78(s16, s16, s32 *); /* extern */ -? func_800C92CC(s32, ?, s32, struct Actor *); /* extern */ -? func_800CAC60(s32); /* extern */ -? func_800CAD40(u8, s16); /* extern */ -extern ? D_801631E0; +void func_800C92CC(s32, ?, s32, struct Actor *); /* extern */ +void func_800CAC60(s32); /* extern */ +void func_800CAD40(u8, s16); /* extern */ +extern s16 D_801631E0; extern s16 D_80163478; extern ? D_801642D8; extern u16 D_801646CC; @@ -10785,7 +10783,7 @@ void func_8001AC10(s32 playerId, s32 arg1, s32 *arg2) { var_a2 = arg2; temp_t9 = &gPlayerOne[playerId]; sp2C = temp_t9; - if ((gModeSelection != (s32) 1) && (D_801646CC != (u16) 1) && !(temp_t9->unk_000 & 0x800)) { + if ((gModeSelection != (s32) TIME_TRIALS) && (D_801646CC != (u16) 1) && !(temp_t9->unk_000 & 0x800)) { temp_s0 = (playerId * 0x10) + &D_801642D8; temp_a1 = temp_s0->unk0; switch (temp_a1) { /* switch 1 */ @@ -11214,8 +11212,8 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001AC10.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000F628(); /* extern */ -? func_8003680C(void *, ?); /* extern */ +void func_8000F628(); /* extern */ +void func_8003680C(void *, ?); /* extern */ extern ? D_80163410; extern ? D_801634F8; @@ -11286,9 +11284,9 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001BE78.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? init_seg_8028DF00(); // extern -? func_80014DE4(?); // extern -? func_8001BE78(); // extern +void init_seg_8028DF00(); // extern +void func_80014DE4(?); // extern +void func_8001BE78(); // extern extern f32 D_800ED4B4; extern f32 D_800ED4B8; extern f32 D_800ED4BC; @@ -11338,7 +11336,7 @@ GLOBAL_ASM("asm/non_matchings/code_80005FD0/func_8001C05C.s") #ifdef MIPS_TO_C //generated by m2c commit bece1d6db17040749f77dbbd090363cc6fb926f9 -? func_80009B60(s32); /* extern */ +void func_80009B60(s32); /* extern */ extern ? D_80163418; extern ? D_80163438; extern s16 D_8016347C; diff --git a/src/code_8001F980.c b/src/code_8001F980.c index b5bccee81..0b7f7d386 100644 --- a/src/code_8001F980.c +++ b/src/code_8001F980.c @@ -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; diff --git a/src/code_80027D00.c b/src/code_80027D00.c index 86348e80e..013e46ffd 100644 --- a/src/code_80027D00.c +++ b/src/code_80027D00.c @@ -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 */ diff --git a/src/code_80027D00.h b/src/code_80027D00.h index e326c1121..3d698033b 100644 --- a/src/code_80027D00.h +++ b/src/code_80027D00.h @@ -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 diff --git a/src/code_800431B0.c b/src/code_800431B0.c index c89c05a5a..bcf03eb59 100644 --- a/src/code_800431B0.c +++ b/src/code_800431B0.c @@ -1278,8 +1278,8 @@ UNUSED void func_80045C48(Vec3f arg0, Vec3s arg1, f32 arg2, Vtx *arg3) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80043D50(s32, s32, s32); // extern -? func_80045B2C(s32); // extern +void func_80043D50(s32, s32, s32); // extern +void func_80045B2C(s32); // extern void func_80045D0C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { @@ -1315,8 +1315,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80045D0C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80043D50(s32, s32, s32); // extern -? func_80045B2C(s32); // extern +void func_80043D50(s32, s32, s32); // extern +void func_80045B2C(s32); // extern void func_80045E10(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { @@ -1352,8 +1352,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80045E10.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80043EF8(s32, s32, s32, s32); // extern -? func_80045B2C(s32); // extern +void func_80043EF8(s32, s32, s32, s32); // extern +void func_80045B2C(s32); // extern void func_80045F18(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { @@ -1389,10 +1389,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80045F18.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80045738(s32, s32, s32, s32); // extern -? func_80045B2C(s32); // extern -extern ? D_0D008120; -extern ? D_0D008138; +void func_80045738(s32, s32, s32, s32); // extern +void func_80045B2C(s32); // extern +extern Gfx D_0D008120; +extern Gfx D_0D008138; void func_80046030(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { @@ -1443,8 +1443,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80046030.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80043A84(s32, s32, s32); // extern -? func_80045B2C(s32); // extern +void func_80043A84(s32, s32, s32); // extern +void func_80045B2C(s32); // extern void func_800461A4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { @@ -1480,8 +1480,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800461A4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80043A84(s32, s32, s32); // extern -? func_80045B2C(s32); // extern +void func_80043A84(s32, s32, s32); // extern +void func_80045B2C(s32); // extern void func_800462A8(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { @@ -1669,8 +1669,8 @@ void func_80046F60(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800452A4(s32, s32, s32); // extern -extern ? D_0D006940; +void func_800452A4(s32, s32, s32); // extern +extern Gfx D_0D006940; void func_80047068(s32 arg0, s32 arg1, s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6) { @@ -1746,8 +1746,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80047068.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800452A4(s32, s32, s32); // extern -extern ? D_0D006940; +void func_800452A4(s32, s32, s32); // extern +extern Gfx D_0D006940; void func_80047270(s32 arg0, s32 arg1, s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6) { @@ -1822,8 +1822,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80047270.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004544C(s32, s32, s32, s32); // extern -extern ? D_0D006940; +void func_8004544C(s32, s32, s32, s32); // extern +extern Gfx D_0D006940; void func_8004747C(s32 arg0, s32 arg1, s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7) { @@ -1898,8 +1898,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004747C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800452A4(s32, s32, s32); // extern -extern ? D_0D006940; +void func_800452A4(s32, s32, s32); // extern +extern Gfx D_0D006940; void func_8004768C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { @@ -2246,8 +2246,8 @@ UNUSED void func_80048F38(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4, s32 #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800441E0(s32, s32, s32); // extern -extern ? D_0D006940; +void func_800441E0(s32, s32, s32); // extern +extern Gfx D_0D006940; void func_80048F8C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { @@ -2320,8 +2320,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80048F8C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80044388(s32, s32, s32); // extern -extern ? D_0D006940; +void func_80044388(s32, s32, s32); // extern +extern Gfx D_0D006940; void func_80049130(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { @@ -2394,8 +2394,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80049130.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800444B0(s32, s32, s32); // extern -extern ? D_0D006940; +void func_800444B0(s32, s32, s32); // extern +extern Gfx D_0D006940; void func_800492D4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { @@ -2468,8 +2468,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800492D4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80044658(s32, s32, s32); // extern -extern ? D_0D006940; +void func_80044658(s32, s32, s32); // extern +extern Gfx D_0D006940; void func_80049478(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { @@ -2542,8 +2542,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80049478.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80044924(s32, s32, s32); // extern -extern ? D_0D006940; +void func_80044924(s32, s32, s32); // extern +extern Gfx D_0D006940; void func_8004961C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { @@ -2616,8 +2616,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004961C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80044BF8(s32, s32, s32); // extern -extern ? D_0D006940; +void func_80044BF8(s32, s32, s32); // extern +extern Gfx D_0D006940; void func_800497CC(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { @@ -2690,8 +2690,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800497CC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80044DA0(s32, s32, s32); // extern -extern ? D_0D006940; +void func_80044DA0(s32, s32, s32); // extern +extern Gfx D_0D006940; void func_80049970(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { @@ -2903,11 +2903,11 @@ UNUSED void func_8004A5E4(s32 arg0, s32 arg1, f32 arg2, s32 arg3, s32 arg4) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 //s32 func_80041924(); // extern -//? func_80043050(? *, void *, s32); // extern +//void func_80043050(? *, void *, s32); // extern //f32 func_802ABE30(f32, ?, ? *, ?32, u16); // extern -//extern ? D_0D007B98; +//extern Gfx D_0D007B98; //extern f64 D_800EE030; -//extern ? D_80183E50; +//extern f32 D_80183E50; extern Gfx D_0D007B98[]; extern f64 D_800EE030; @@ -2998,7 +2998,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004A7AC.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_0D007B98; +extern Gfx D_0D007B98; extern f32 D_80183E50; void func_8004A870(s32 objectIndex, f32 arg1) { @@ -3258,7 +3258,7 @@ void func_8004B950(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B7DC(s32, s32, s32, s32, s32, s32, s32); // extern +void func_8004B7DC(s32, s32, s32, s32, s32, s32, s32); // extern void func_8004B97C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { s32 sp2C; @@ -3290,7 +3290,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004B97C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B7DC(s32, s32, s32, s32, s32, s32, s32); // extern +void func_8004B7DC(s32, s32, s32, s32, s32, s32, s32); // extern void func_8004BA08(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4) { s32 sp2C; @@ -3322,7 +3322,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004BA08.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B7DC(s32, s32, s32, s32, s32, s32, s32); // extern +void func_8004B7DC(s32, s32, s32, s32, s32, s32, s32); // extern void func_8004BA98(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5, s32 arg6) { s32 sp34; @@ -3579,8 +3579,8 @@ void func_8004C148(s16 arg0, s16 arg1, s16 arg2, u16 arg3, u16 arg4, u16 arg5, u #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80043D50(s32, u32, u32); // extern -? func_8004B97C(s32, s32, u32, u32, s32); // extern +void func_80043D50(s32, u32, u32); // extern +void func_8004B97C(s32, s32, u32, u32, s32); // extern void func_8004C268(s32 arg0, s32 arg1, s32 arg2, u32 arg3, u32 arg4, u32 arg5, s32 arg6) { u32 temp_lo; @@ -3653,10 +3653,10 @@ void func_8004C628(s32 arg0, s32 arg1, u32 arg2, u32 arg3, s32 arg4) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80043C28(s32, u32, u32); // extern -? func_8004B950(s32, s32, u32, u32, s32); // extern -extern ? D_0D007EB8; -extern ? D_0D007EF8; +void func_80043C28(s32, u32, u32); // extern +void func_8004B950(s32, s32, u32, u32, s32); // extern +extern Gfx D_0D007EB8; +extern Gfx D_0D007EF8; void func_8004C6FC(s16 arg0, s16 arg1, s32 arg2, u32 arg3, u32 arg4) { @@ -3801,9 +3801,9 @@ UNUSED void func_8004CD18(s32 arg0, s32 arg1, s32 arg2) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800441E0(s32, s32, s32); // extern +void func_800441E0(s32, s32, s32); // extern void *func_8004B97C(s32, s32, s32, s32, s32); // extern -extern ? D_0D007FE0; +extern Gfx D_0D007FE0; void *func_8004CD48(s32 arg0, s32 arg1, ? arg2, s32 arg3, s32 arg4, s32 arg5) { @@ -3848,8 +3848,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004CD48.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800444B0(s32, s32, s32); // extern -? func_8004B97C(s32, s32, s32, s32, s32); // extern +void func_800444B0(s32, s32, s32); // extern +void func_8004B97C(s32, s32, s32, s32, s32); // extern void func_8004CE8C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { s32 temp_lo; @@ -3899,9 +3899,9 @@ UNUSED void func_8004D0CC(void) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80044924(s32, s32, s32); // extern +void func_80044924(s32, s32, s32); // extern void *func_8004B97C(s32, s32, s32, s32, s32); // extern -extern ? D_0D007FE0; +extern Gfx D_0D007FE0; void *func_8004D0D4(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { @@ -3972,10 +3972,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004D210.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80044F34(s32, s32, s32); // extern -? func_8004B414(?, s32, s32, s32); // extern -? func_8004B97C(s32, s32, s32, s32, s32); // extern -extern ? D_0D007FE0; +void func_80044F34(s32, s32, s32); // extern +void func_8004B414(?, s32, s32, s32); // extern +void func_8004B97C(s32, s32, s32, s32, s32); // extern +extern Gfx D_0D007FE0; void func_8004D37C(s32 arg0, s32 arg1, s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 argA) { @@ -4012,10 +4012,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004D37C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800450C8(s32, s32, s32); // extern -? func_8004B414(?, s32, s32, s32); // extern -? func_8004BA08(s32, s32, s32, s32, s32); // extern -extern ? D_0D007FE0; +void func_800450C8(s32, s32, s32); // extern +void func_8004B414(?, s32, s32, s32); // extern +void func_8004BA08(s32, s32, s32, s32, s32); // extern +extern Gfx D_0D007FE0; void func_8004D4E8(s32 arg0, s32 arg1, s32 arg2, ? arg3, s32 arg4, s32 arg5, s32 arg6, s32 arg7, s32 arg8, s32 argA) { @@ -4080,10 +4080,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004D654.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800441E0(s32, s32, ?); // extern -? func_8004B97C(s32, s32, s32, ?, s32); // extern +void func_800441E0(s32, s32, ?); // extern +void func_8004B97C(s32, s32, s32, ?, s32); // extern f32 sins(s32); // extern -extern ? D_0D007FE0; +extern Gfx D_0D007FE0; extern u16 D_801656B0; extern s16 D_80165708; extern s16 D_80165710; @@ -4136,10 +4136,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004D7B4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800444B0(s32, s32, ?); // extern -? func_8004B97C(s32, s32, s32, ?, s32); // extern +void func_800444B0(s32, s32, ?); // extern +void func_8004B97C(s32, s32, s32, ?, s32); // extern f32 sins(s32); // extern -extern ? D_0D007FE0; +extern Gfx D_0D007FE0; extern u16 D_801656B0; extern s16 D_80165708; extern s16 D_80165710; @@ -4190,10 +4190,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004D93C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80044924(s32, s32, ?); // extern -? func_8004B97C(s32, s32, s32, ?, s32); // extern +void func_80044924(s32, s32, ?); // extern +void func_8004B97C(s32, s32, s32, ?, s32); // extern f32 sins(s32); // extern -extern ? D_0D007FE0; +extern Gfx D_0D007FE0; extern u16 D_801656B0; extern s16 D_80165708; extern s16 D_80165710; @@ -4308,8 +4308,8 @@ UNUSED void func_8004DF24(s32 arg0, s32 arg1, s32 arg2) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800452A4(s32, s32, s32); // extern -? func_8004B97C(s32, s32, s32, s32, s32); // extern +void func_800452A4(s32, s32, s32); // extern +void func_8004B97C(s32, s32, s32, s32, s32); // extern void func_8004DF5C(s32 arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) { s32 temp_lo; @@ -4339,8 +4339,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004DF5C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800452A4(s32, s32, ?); // extern -? func_8004B97C(u32, s32, s32, ?, s32); // extern +void func_800452A4(s32, s32, ?); // extern +void func_8004B97C(u32, s32, s32, ?, s32); // extern f32 sins(s32); // extern extern u16 D_801656B0; extern s16 D_80165708; @@ -4462,8 +4462,8 @@ UNUSED void func_8004E604(s32 arg0, s32 arg1, u8 *tlut, s32 arg3) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8004E4CC(s32, s32, s32 *, s32 *); /* extern */ -extern ? D_80183E88; +void func_8004E4CC(s32, s32, s32 *, s32 *); /* extern */ +extern s32 D_80183E88; void func_8004E638(s32 playerId) { struct_80165C18_entry *temp_v1; @@ -4481,9 +4481,9 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004E638.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80047910(s32, s32, ?, f32, s32 *, s32 *, ? *, s32, s32, s32, s32); /* extern */ -extern ? D_0D005C30; -extern ? D_80183E88; +void func_80047910(s32, s32, ?, f32, s32 *, s32 *, ? *, s32, s32, s32, s32); /* extern */ +extern Vtx D_0D005C30; +extern s32 D_80183E88; void func_8004E6C4(s32 playerId) { struct_80165C18_entry *temp_v1; @@ -4501,12 +4501,12 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004E6C4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? func_8004CB60(s16, s32, ? *); /* extern */ -? func_8004CB90(s32, s16, ? *); /* extern */ +void func_8004CB60(s16, s32, ? *); /* extern */ +void func_8004CB90(s32, s16, ? *); /* extern */ extern ? D_0D00A958; -extern ? D_0D00B158; -extern ? D_0D00B558; -extern ? D_0D00B958; +extern s8 D_0D00B158; +extern s8 D_0D00B558; +extern s8 D_0D00B958; static ? *D_800E4570[3] = { &D_0D00B158, &D_0D00B558, &D_0D00B958 }; /* const */ void func_8004E78C(s32 playerId) { @@ -4524,9 +4524,9 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004E78C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? func_8004A384(s32, s32, ?, f32, s32, s32, s32, s32, void *, ? *, s32, s32, s32, s32); /* extern */ -extern ? D_0D0068F0; -extern ? D_0D00D258; +void func_8004A384(s32, s32, ?, f32, s32, s32, s32, s32, void *, ? *, s32, s32, s32, s32); /* extern */ +extern Vtx D_0D0068F0; +extern s8 D_0D00D258; extern s32 D_80165594; extern ? D_8018CF98; static s32 D_800E55F8[8] = { 0xFF, 0xED, 0xD7, 0xBF, 0xA2, 0x82, 0x61, 0x3A }; /* const */ @@ -4551,9 +4551,9 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004E800.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? func_8004A384(s32, s32, ?, f32, s32, s32, s32, s32, void *, ? *, s32, s32, s32, s32); /* extern */ -extern ? D_0D006030; -extern ? D_0D015258; +void func_8004A384(s32, s32, ?, f32, s32, s32, s32, s32, void *, ? *, s32, s32, s32, s32); /* extern */ +extern Vtx D_0D006030; +extern s8 D_0D015258; extern s32 D_80165598; static s32 D_800E5618[4] = { 0xFF, 0xD7, 0xA2, 0x61 }; /* const */ @@ -4581,13 +4581,13 @@ void func_8004EB30(s32 arg0) { #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? func_8004C9D8(s16, s16, ?, ? *, s32, s32, s32, s32); /* extern */ -? func_8004F950(s16, s16, ?, u32); /* extern */ +void func_8004C9D8(s16, s16, ?, ? *, s32, s32, s32, s32); /* extern */ +void func_8004F950(s16, s16, ?, u32); /* extern */ extern ? D_0D00A958; -extern ? D_0D00B158; -extern ? D_0D00B558; -extern ? D_0D00B958; -extern ? D_0D00C158; +extern s8 D_0D00B158; +extern s8 D_0D00B558; +extern s8 D_0D00B958; +extern s8 D_0D00C158; static ? *D_800E4570[3] = { &D_0D00B158, &D_0D00B558, &D_0D00B958 }; /* const */ void func_8004EB38(s32 playerId) { @@ -4617,12 +4617,12 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004EB38.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? func_8004A258(s32, s32, u16, ?, ? *, ? *, s32, s32, s32, s32); /* extern */ -? func_8004A2F4(s16, s16, ?, ?, s32, s32, s32, s32, ? *, ? *, s32, s32, s32, s32); /* extern */ -extern ? D_0D005FF0; -extern ? D_0D0064B0; -extern ? D_0D009958; -extern ? D_0D00A558; +void func_8004A258(s32, s32, u16, ?, ? *, ? *, s32, s32, s32, s32); /* extern */ +void func_8004A2F4(s16, s16, ?, ?, s32, s32, s32, s32, ? *, ? *, s32, s32, s32, s32); /* extern */ +extern Vtx D_0D005FF0; +extern Vtx D_0D0064B0; +extern s8 D_0D009958; +extern s8 D_0D00A558; extern u16 D_8016579E; extern f32 D_8018CFEC; extern f32 D_8018CFF4; @@ -4643,13 +4643,13 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004ED40.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004D37C(s32, s32, s32, u16, s32, s32, s32, s32, s32, s32, s32); // extern -? func_8004D4E8(s32, s32, s32, u16, s32, s32, s32, s32, s32, s32, s32); // extern +void func_8004D37C(s32, s32, s32, u16, s32, s32, s32, s32, s32, s32, s32); // extern +void func_8004D4E8(s32, s32, s32, u16, s32, s32, s32, s32, s32, s32, s32); // extern extern s32 D_8018D240; extern s16 D_8018D2B0; extern s16 D_8018D2B8; -extern ? D_8018D2C0; -extern ? D_8018D2D8; +extern s16 D_8018D2C0; +extern s16 D_8018D2D8; extern s16 D_8018D2F0; extern s16 D_8018D2F8; extern u16 D_8018D300; @@ -4682,9 +4682,9 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004EE54.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004D37C(?, ?, s32, ?, s32, s32, s32, s32, s32, s32, s32); // extern -extern ? D_800E5548; -extern ? D_8018D248; +void func_8004D37C(?, ?, s32, ?, s32, s32, s32, s32, s32, s32, s32); // extern +extern s16 D_800E5548; +extern s32 D_8018D248; void func_8004EF9C(s32 arg0) { s16 temp_t0; @@ -4702,12 +4702,12 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004EF9C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004CAD0(s32, s32, ? *); // extern -extern ? D_0D02CC58; +void func_8004CAD0(s32, s32, ? *); // extern +extern s8 D_0D02CC58; extern s16 D_8018D2B0; extern s16 D_8018D2B8; -extern ? D_8018D2C0; -extern ? D_8018D2D8; +extern s16 D_8018D2C0; +extern s16 D_8018D2D8; extern s16 D_8018D2E0; extern s16 D_8018D2E8; extern s16 D_8018D2F0; @@ -4748,18 +4748,18 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004F020.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800463B0(f32, s16, s16, s32, ?, void *, ? *, s32, s32, s32, s32); // extern -? func_80046424(f32, s16, s16, s32, ?, void *, ? *, s32, s32, s32, s32); // extern -? func_8004C364(f32, s16, s16, ?, ?, ? *); // extern -? func_8004C450(f32, s16, s16, ?, ?, ? *); // extern -extern ? D_0D005470; -extern ? D_0D02CCD8; -extern ? D_0D02D0D8; +void func_800463B0(f32, s16, s16, s32, ?, void *, ? *, s32, s32, s32, s32); // extern +void func_80046424(f32, s16, s16, s32, ?, void *, ? *, s32, s32, s32, s32); // extern +void func_8004C364(f32, s16, s16, ?, ?, ? *); // extern +void func_8004C450(f32, s16, s16, ?, ?, ? *); // extern +extern Vtx D_0D005470; +extern s8 D_0D02CCD8; +extern s8 D_0D02D0D8; extern f32 D_8018D2A0; extern s16 D_8018D2B0; extern s16 D_8018D2B8; -extern ? D_8018D2C0; -extern ? D_8018D2D8; +extern s16 D_8018D2C0; +extern s16 D_8018D2D8; extern s16 D_8018D2E0; extern s16 D_8018D2E8; extern s16 D_8018D2F0; @@ -4803,8 +4803,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004F168.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004F168(s32, s16, u16); // extern -extern ? gGPCurrentRacePlayerIdByRank; +void func_8004F168(s32, s16, u16); // extern +extern s16 gGPCurrentRacePlayerIdByRank; extern s32 D_8018D158; void func_8004F3E4(s32 arg0) { @@ -4942,7 +4942,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004F674.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s8 func_8004F674(s32 *, ?); // extern -extern ? D_801657D0; +extern s8 D_801657D0; void func_8004F6D0(s32 arg0) { s32 sp24; @@ -4966,9 +4966,9 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004F6D0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004BA98(s32, ?, ?, ?, s32, s32, s32); // extern +void func_8004BA98(s32, ?, ?, ?, s32, s32, s32); // extern extern s8 D_801657D0; -extern ? D_801657D8; +extern s8 D_801657D8; void func_8004F774(s32 arg0, ? arg1) { s8 *temp_s0; @@ -5000,9 +5000,9 @@ void print_timer(s32 arg0, s32 arg1, s32 arg2) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004BA98(s32, ?, ?, ?, s32, s32, s32); // extern +void func_8004BA98(s32, ?, ?, ?, s32, s32, s32); // extern extern s8 D_801657D0; -extern ? D_801657D8; +extern s8 D_801657D8; void func_8004F8CC(s32 arg0, ? arg1) { s8 *temp_s0; @@ -5040,11 +5040,11 @@ void func_8004F9CC(s32 arg0, s32 arg1, s32 arg2) { #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? func_8004CB90(s32, s32, ? *); /* extern */ -? func_8004F9CC(s16, s16, u32); /* extern */ -? print_timer(s16, s16, u32); /* extern */ -extern ? D_0D00BD58; -extern ? D_0D00C158; +void func_8004CB90(s32, s32, ? *); /* extern */ +void func_8004F9CC(s16, s16, u32); /* extern */ +void print_timer(s16, s16, u32); /* extern */ +extern s8 D_0D00BD58; +extern s8 D_0D00C158; extern s32 D_80165658; extern s8 D_801657E3; extern s8 D_801657E5; @@ -5060,7 +5060,7 @@ void func_8004FA78(s32 playerId) { struct_8018CA70_entry *phi_s2; temp_v0 = gModeSelection; - if ((temp_v0 != 2) && (temp_v0 != 3)) { + if ((temp_v0 != VERSUS) && (temp_v0 != BATTLE)) { temp_s4 = &D_8018CA70[playerId]; if (D_8018D320 == temp_s4->lapCount) { phi_s3 = &D_80165658; @@ -5121,22 +5121,22 @@ void func_8004FC78(s16 arg0, s16 arg1, s8 arg2) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(s32, s32, ?, ?); // extern -? func_80044924(? *, ?, ?); // extern -? func_800452A4(? *, ?, ?); // extern -? func_8004B35C(s32, s32, s32, s32); // extern -extern ? D_0D006980; -extern ? D_0D0069E0; -extern ? D_0D0069F8; -extern ? D_0D007A60; -extern ? D_0D007CB8; -extern ? D_0D007DB8; +void func_80042330(s32, s32, ?, ?); // extern +void func_80044924(? *, ?, ?); // extern +void func_800452A4(? *, ?, ?); // extern +void func_8004B35C(s32, s32, s32, s32); // extern +extern Gfx D_0D006980; +extern Gfx D_0D0069E0; +extern Gfx D_0D0069F8; +extern Gfx D_0D007A60; +extern Gfx D_0D007CB8; +extern Gfx D_0D007DB8; extern ? D_0D019458; extern ? D_0D019658; -extern ? D_0D01A2D8; -extern ? D_0D01B4D8; -extern ? D_0D01DAD8; -extern ? D_800E457C; +extern s8 D_0D01A2D8; +extern s8 D_0D01B4D8; +extern s8 D_0D01DAD8; +extern u32 D_800E457C; extern ? D_800E459C; extern s32 D_8018D3E0; extern s32 D_8018D3E4; @@ -5335,10 +5335,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004FDB4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_8004FDB4(f32, f32, s32, s32, s16, s16, s32, s32, s32, s32, s32); /* extern */ -extern ? gGPCurrentRacePlayerIdByRank; +void func_8004FDB4(f32, f32, s32, s32, s16, s16, s32, s32, s32, s32, s32); /* extern */ +extern s16 gGPCurrentRacePlayerIdByRank; extern s8 D_801657E2; -extern ? D_8018D028; +extern f32 D_8018D028; extern f32 D_8018D050; extern ? D_8018D078; extern s32 D_8018D3E0; @@ -5428,10 +5428,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80050320.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? gLapCompletionPercentByPlayerId; -extern ? gLapCountByPlayerId; +extern f32 gLapCompletionPercentByPlayerId; +extern s32 gLapCountByPlayerId; -? func_80050644(s32 arg0, s32 *arg1, s32 *arg2) { +s32 func_80050644(s32 arg0, s32 *arg1, s32 *arg2) { s32 temp_a3; s32 temp_t0; s32 temp_t6; @@ -5489,7 +5489,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80050644.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -extern ? D_80163E2A; +extern u16 D_80163E2A; extern u16 D_80164430; void func_800507D8(s32 arg0, s32 *arg1, s32 *arg2) { @@ -5525,8 +5525,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800507D8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_8004C024(s16, ?, s16, s32, s32, s32, s32); /* extern */ -? func_8004C148(?, s16, s16, s32, s32, s32, s32); /* extern */ +void func_8004C024(s16, ?, s16, s32, s32, s32, s32); /* extern */ +void func_8004C148(?, s16, s16, s32, s32, s32, s32); /* extern */ void func_800508C0(void) { s32 sp54; @@ -5696,34 +5696,34 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80050C68.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80044924(? *, ?, ?); /* extern */ -? func_800452A4(? *, ?, ?); /* extern */ -? func_8004B2BC(s16, u16 *, u16 *, ?); /* extern */ -? func_8004B35C(s32, s32, s32, ?); /* extern */ -? func_8004B614(u16, u16, u16, ?, s32, s32, s32); /* extern */ +void func_80044924(? *, ?, ?); /* extern */ +void func_800452A4(? *, ?, ?); /* extern */ +void func_8004B2BC(s16, u16 *, u16 *, ?); /* extern */ +void func_8004B35C(s32, s32, s32, ?); /* extern */ +void func_8004B614(u16, u16, u16, ?, s32, s32, s32); /* extern */ s32 func_80050644(s32, s32 *, s32 *, s32); /* extern */ -extern ? D_0D006950; -extern ? D_0D0069E0; -extern ? D_0D0069F8; -extern ? D_0D007A40; -extern ? D_0D007DB8; +extern Gfx D_0D006950; +extern Gfx D_0D0069E0; +extern Gfx D_0D0069F8; +extern Gfx D_0D007A40; +extern Gfx D_0D007DB8; extern ? D_0D019E58; extern ? D_0D01A058; -extern ? D_0D01A2D8; -extern ? D_0D01A4D8; -extern ? D_0D01A6D8; -extern ? D_0D01A8D8; -extern ? D_0D01AAD8; -extern ? D_0D01ACD8; -extern ? D_0D01AED8; -extern ? D_0D01B0D8; -extern ? D_0D01B2D8; -extern ? D_0D01B4D8; -extern ? D_0D01DAD8; +extern s8 D_0D01A2D8; +extern s8 D_0D01A4D8; +extern s8 D_0D01A6D8; +extern s8 D_0D01A8D8; +extern s8 D_0D01AAD8; +extern s8 D_0D01ACD8; +extern s8 D_0D01AED8; +extern s8 D_0D01B0D8; +extern s8 D_0D01B2D8; +extern s8 D_0D01B4D8; +extern s8 D_0D01DAD8; extern u16 D_801656C0; extern u16 D_801656D0; extern u16 D_801656E0; -extern ? D_8018CE24; +extern s32 D_8018CE24; extern s32 D_8018D3E4; extern s32 D_8018D3E8; extern s32 D_8018D3EC; @@ -5933,7 +5933,7 @@ void func_80050E34(s32 playerId, s32 arg1) { gDisplayListHead = temp_v0_26 + 8; temp_v0_26->words.w0 = 0x06000000; temp_v0_26->words.w1 = (u32) &D_0D006950; - if ((spAC == gPlayerOne) && (gScreenModeSelection == 0)) { + if ((spAC == gPlayerOne) && (gScreenModeSelection == SCREEN_MODE_1P)) { temp_v0_27 = gDisplayListHead; gDisplayListHead = temp_v0_27 + 8; temp_v0_27->words.w1 = (u32) &D_0D007A40; @@ -5954,9 +5954,9 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80050E34.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800508C0(); // extern -? func_80050E34(s16, s32); // extern -extern ? gGPCurrentRacePlayerIdByRank; +void func_800508C0(); // extern +void func_80050E34(s16, s32); // extern +extern s16 gGPCurrentRacePlayerIdByRank; extern s32 D_80164408; @@ -6009,10 +6009,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800514BC.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80043D50(? *, ?, ?); /* extern */ -extern ? D_0D0069C8; -extern ? D_0D0079C8; -extern ? D_0D028DD8; +void func_80043D50(? *, ?, ?); /* extern */ +extern Gfx D_0D0069C8; +extern Gfx D_0D0079C8; +extern s8 D_0D028DD8; extern s32 D_8018C970; void func_80051638(s32 arg0) { @@ -6064,12 +6064,12 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80051638.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80043104(s32); // extern -? func_80044F34(? *, ?, ?); // extern -extern ? D_0D006980; -extern ? D_0D007AE0; -extern ? D_0D0293D8; -extern ? D_80165C18; +void func_80043104(s32); // extern +void func_80044F34(? *, ?, ?); // extern +extern Gfx D_0D006980; +extern Gfx D_0D007AE0; +extern s8 D_0D0293D8; +extern struct_80165C18_entry D_80165C18; extern s32 D_8018C1B0; extern ? D_8018C278; @@ -6116,10 +6116,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800517C8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(s16, s16, ?, s32); // extern -? func_80044DA0(s32, u8, u8); // extern -extern ? D_0D006940; -extern ? D_80165C18; +void func_80042330(s16, s16, ?, s32); // extern +void func_80044DA0(s32, u8, u8); // extern +extern Gfx D_0D006940; +extern struct_80165C18_entry D_80165C18; extern u8 D_8018D228; @@ -6158,11 +6158,11 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800518F8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042330(s16, s16, ?, s32); // extern -? func_80044DA0(s32, u8, u8); // extern -? func_8004B138(?, ?, ?, s16); // extern -extern ? D_0D006940; -extern ? D_80165C18; +void func_80042330(s16, s16, ?, s32); // extern +void func_80044DA0(s32, u8, u8); // extern +void func_8004B138(?, ?, ?, s16); // extern +extern Gfx D_0D006940; +extern struct_80165C18_entry D_80165C18; extern u8 D_8018D228; @@ -6197,12 +6197,12 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800519D4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B414(?, ?, ?, ?); // extern -? func_8004B6C4(?, ?, ?); // extern -? func_800518F8(s32, s16, s16); // extern -? func_800519D4(s32, s16, s16); // extern -extern ? D_0D007A60; -extern ? D_80165C18; +void func_8004B414(?, ?, ?, ?); // extern +void func_8004B6C4(?, ?, ?); // extern +void func_800518F8(s32, s16, s16); // extern +void func_800519D4(s32, s16, s16); // extern +extern Gfx D_0D007A60; +extern struct_80165C18_entry D_80165C18; extern ? D_8018CC80; extern s32 D_8018D1F0; extern s8 D_8018D228; @@ -6265,13 +6265,13 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80051ABC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B414(?, ?, ?, ?); // extern -? func_8004B6C4(?, ?, ?); // extern -? func_800518F8(s32, s16, s16); // extern -? func_800519D4(s32, s16, s16); // extern -extern ? D_0D007A60; +void func_8004B414(?, ?, ?, ?); // extern +void func_8004B6C4(?, ?, ?); // extern +void func_800518F8(s32, s16, s16); // extern +void func_800519D4(s32, s16, s16); // extern +extern Gfx D_0D007A60; extern s8 D_801658FE; -extern ? D_80165C18; +extern struct_80165C18_entry D_80165C18; extern ? D_8018CC80; extern s32 D_8018D1F0; extern s8 D_8018D228; @@ -6358,7 +6358,7 @@ void func_80051EBC(void) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80051ABC(s16, ?); // extern +void func_80051ABC(s16, ?); // extern void func_80051EF8(void) { s16 temp_a0; @@ -6384,7 +6384,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80051EF8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80051ABC(s16, s32); // extern +void func_80051ABC(s16, s32); // extern extern void *D_800DC5F0; extern s32 D_8018D1F0; @@ -6418,7 +6418,7 @@ void func_80052044(void) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80051C60(s16, s32); // extern +void func_80051C60(s16, s32); // extern extern void *D_800DC5F0; extern s32 D_8018D1F0; @@ -6482,14 +6482,14 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800520C0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042E00(void *, void *, s32, s32); // extern -? func_800520C0(s32); // extern +void func_80042E00(void *, void *, s32, s32); // extern +void func_800520C0(s32); // extern s32 func_8007223C(s32, ?, s32); // extern extern ? D_06007650; extern ? D_060078C0; extern ? D_06007978; extern ? D_06007B38; -extern ? D_0D007828; +extern Gfx D_0D007828; extern ? D_800E45C0; extern ? D_800E45C8; extern ? D_800E45D8; @@ -6498,7 +6498,7 @@ extern ? D_800E45F0; extern ? D_800E45F8; extern ? D_800E4608; extern ? D_800E4610; -extern ? D_80165C18; +extern struct_80165C18_entry D_80165C18; extern s32 D_80183F28; @@ -6592,10 +6592,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8005217C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, s32); // extern -? func_800484BC(void *, void *, s32, s16, s32, s32, s32, s32, s32, s32, s32); // extern -? func_8004A630(? *, void *, ?); // extern +void func_800484BC(void *, void *, s32, s16, s32, s32, s32, s32, s32, s32, s32); // extern +void func_8004A630(? *, void *, ?); // extern s32 func_8007223C(s32, ?); // extern -extern ? D_80165C18; +extern struct_80165C18_entry D_80165C18; extern ? D_8018C830; void func_800523B8(s32 arg0, s32 arg1, u32 arg2) { @@ -6622,10 +6622,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800523B8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800523B8(s32, s32, s32); // extern +void func_800523B8(s32, s32, s32); // extern s32 func_8007223C(s32, ?); // extern s32 func_8008A364(s32, s32, ?, ?); // extern -extern ? D_80165C18; +extern struct_80165C18_entry D_80165C18; extern s32 D_8018BFA8; extern ? D_8018BFD0; @@ -6655,11 +6655,11 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800524B4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, s32); // extern -? func_800431B0(void *, ? *, s32, ? *); // extern -? func_80046F60(s32, s32, ?, ?, s32); // extern -extern ? D_0D0062B0; -extern ? D_80165C18; -extern ? D_80183E80; +void func_800431B0(void *, ? *, s32, ? *); // extern +void func_80046F60(s32, s32, ?, ?, s32); // extern +extern Vtx D_0D0062B0; +extern struct_80165C18_entry D_80165C18; +extern s16 D_80183E80; extern s32 D_80183EA0; extern s32 D_8018C3F0; extern ? D_8018C490; @@ -6731,10 +6731,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80052590.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80043220(void *, void *, s32, s32); // extern +void func_80043220(void *, void *, s32, s32); // extern s32 func_8007223C(s32, ?); // extern -? func_8008A364(s32, s32, ?, ?); // extern -extern ? D_80165C18; +u32 func_8008A364(s32, s32, ?, ?); // extern +extern struct_80165C18_entry D_80165C18; extern s32 D_80183EA4; void func_800527D8(s32 arg0) { @@ -6758,10 +6758,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800527D8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80043500(? *, ? *, ?, ? *); // extern +void func_80043500(? *, ? *, ?, ? *); // extern extern ? D_06007218; -extern ? D_80183E40; -extern ? D_80183E80; +extern f32 D_80183E40; +extern s16 D_80183E80; void func_8005285C(s32 arg0) { Player *temp_v0; @@ -6781,17 +6781,17 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8005285C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042E00(void *, ? *, s32); // extern -? func_800441E0(? *, ?, ?); // extern -extern ? D_060068E8; -extern ? D_0D005BD0; -extern ? D_0D006930; -extern ? D_0D007B00; +void func_80042E00(void *, ? *, s32); // extern +void func_800441E0(? *, ?, ?); // extern +extern s32 D_060068E8; +extern Vtx D_0D005BD0; +extern Gfx D_0D006930; +extern Gfx D_0D007B00; extern ? D_800E4620; extern ? D_800E4628; extern ? D_8016582C; -extern ? D_80165C18; -extern ? D_80183E80; +extern struct_80165C18_entry D_80165C18; +extern s16 D_80183E80; extern s32 D_8018C3F0; extern ? D_8018C5F0; extern s32 D_8018D120; @@ -6915,8 +6915,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800528EC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8005285C(s32); // extern -? func_800528EC(s32); // extern +void func_8005285C(s32); // extern +void func_800528EC(s32); // extern s32 func_80072320(s32, ?); // extern extern ? D_800E4620; extern ? D_800E4628; @@ -6965,12 +6965,12 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80052C60.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800435A0(? *, ? *, ?, ? *, s32); // extern +void func_800435A0(? *, ? *, ?, ? *, s32); // extern s32 func_80072320(s32, ?); // extern extern ? D_06007218; -extern ? D_80183DB8; -extern ? D_80183E40; -extern ? D_80183E80; +extern s32 D_80183DB8; +extern f32 D_80183E40; +extern s16 D_80183E80; void func_80052D70(s32 arg0) { Player *sp20; @@ -6991,11 +6991,11 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80052D70.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80052D70(s32); // extern +void func_80052D70(s32); // extern extern ? D_800E4620; extern ? D_800E4628; extern ? D_80165840; -extern ? D_80183E80; +extern s16 D_80183E80; void func_80052E30(s32 arg0) { @@ -7036,14 +7036,14 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80052E30.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, s32); // extern -? func_80043104(s32); // extern -? func_80046E60(? *, ? *, ?, ?); // extern +void func_80043104(s32); // extern +void func_80046E60(? *, ? *, ?, ?); // extern s32 func_8007223C(s32, ?); // extern -? func_8008A364(s32, s32, ?, ?); // extern -extern ? D_06006D20; -extern ? D_06006F20; -extern ? D_0D0069E0; -extern ? D_80165C18; +u32 func_8008A364(s32, s32, ?, ?); // extern +extern s32 D_06006D20; +extern s32 D_06006F20; +extern Gfx D_0D0069E0; +extern struct_80165C18_entry D_80165C18; extern s32 D_8018C3F0; extern ? D_8018C5F0; @@ -7091,14 +7091,14 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80052F20.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, s32); // extern -? func_800480B4(void *, ? *, s32, s32, s32, s32, s32, s32, s32, s32); // extern +void func_800480B4(void *, ? *, s32, s32, s32, s32, s32, s32, s32, s32); // extern s32 func_8007223C(s32, ?); // extern -? func_8008A364(s32, s32, ?, ?); // extern -extern ? D_80165C18; -extern ? D_80183E80; +u32 func_8008A364(s32, s32, ?, ?); // extern +extern struct_80165C18_entry D_80165C18; +extern s16 D_80183E80; extern s32 D_80183EA0; extern ? D_80183EEC; -extern ? D_80183F28; +extern s32 D_80183F28; void func_8005309C(s32 arg0) { s32 *temp_s3; @@ -7147,13 +7147,13 @@ void func_8005327C(s32 arg0) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, s32); // extern -? func_800480B4(void *, void *, s32, s32, s32, s32, s32, s32, s32, s32); // extern -? func_800485C4(void *, void *, s32, s16, s32, s32, s32, s32, s32, s32, s32); // extern -? func_8004A630(f32, void *, void *, ?); // extern +void func_800480B4(void *, void *, s32, s32, s32, s32, s32, s32, s32, s32); // extern +void func_800485C4(void *, void *, s32, s16, s32, s32, s32, s32, s32, s32, s32); // extern +void func_8004A630(f32, void *, void *, ?); // extern s32 func_8007223C(s32, ?, s32); // extern s32 func_80072354(s32, ?); // extern -extern ? D_80165C18; -extern ? D_80183DB8; +extern struct_80165C18_entry D_80165C18; +extern s32 D_80183DB8; extern ? D_8018C0B0; extern void *D_8018CF14; @@ -7225,7 +7225,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800532A4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800419F8(); // extern +void func_800419F8(); // extern extern ? D_800E4638; extern ? D_80165840; @@ -7328,14 +7328,14 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800534E8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042E00(void *, void *, s32); // extern -? func_8004544C(s32, ?, ?, ?); // extern -? func_8004A7AC(s32, ?); // extern -? func_800534E8(s32); // extern +void func_80042E00(void *, void *, s32); // extern +void func_8004544C(s32, ?, ?, ?); // extern +void func_8004A7AC(s32, ?); // extern +void func_800534E8(s32); // extern s32 func_80072354(?); // extern -extern ? D_06006F38; -extern ? D_0D007828; -extern ? D_80165C18; +extern s32 D_06006F38; +extern Gfx D_0D007828; +extern struct_80165C18_entry D_80165C18; void func_800536C8(s32 arg0) { @@ -7403,34 +7403,34 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800536C8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, s32); // extern -? func_80042E00(void *, void *, s32, s32 *); // extern -? func_800431B0(void *, ? *, s32, ? *); // extern -? func_80043D50(? *, ?, ?); // extern -? func_800444B0(s32, ?, ?, u32); // extern -? func_8004B138(?, ?, ?, s16); // extern -? func_8004B3C8(?); // extern -? func_800534A4(s32); // extern -? func_800536C8(s32); // extern -? func_800721E8(s32, ?); // extern -? func_800722CC(s32, ?); // extern +void func_80042E00(void *, void *, s32, s32 *); // extern +void func_800431B0(void *, ? *, s32, ? *); // extern +void func_80043D50(? *, ?, ?); // extern +void func_800444B0(s32, ?, ?, u32); // extern +void func_8004B138(?, ?, ?, s16); // extern +void func_8004B3C8(?); // extern +void func_800534A4(s32); // extern +void func_800536C8(s32); // extern +void func_800721E8(s32, ?); // extern +void func_800722CC(s32, ?); // extern s32 func_8008A140(s32, s32, ?); // extern extern ? D_06006738; -extern ? D_0D005AE0; -extern ? D_0D005C00; -extern ? D_0D006930; -extern ? D_0D0079C8; -extern ? D_0D007AE0; +extern Vtx D_0D005AE0; +extern Vtx D_0D005C00; +extern Gfx D_0D006930; +extern Gfx D_0D0079C8; +extern Gfx D_0D007AE0; extern ? D_800E4668; extern ? D_800E4670; extern s16 D_80165750; -extern ? D_80165C18; -extern ? D_80183E80; +extern struct_80165C18_entry D_80165C18; +extern s16 D_80183E80; extern s32 D_80183EA0; extern s32 D_8018C3F0; extern ? D_8018C5F0; extern s32 D_8018C630; extern ? D_8018C830; -extern ? D_8018CF68; +extern s16 D_8018CF68; extern s32 D_8018D120; extern s32 D_8018D490; @@ -7598,12 +7598,12 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80053870.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042E00(void *, ? *, s32); // extern -? func_8004B1C8(s16, s16, s16, s16, s32, s32, s32); // extern -extern ? D_0D0060B0; -extern ? D_0D006940; -extern ? D_80165C18; -extern ? D_80183E80; +void func_80042E00(void *, ? *, s32); // extern +void func_8004B1C8(s16, s16, s16, s16, s32, s32, s32); // extern +extern Vtx D_0D0060B0; +extern Gfx D_0D006940; +extern struct_80165C18_entry D_80165C18; +extern s16 D_80183E80; extern s32 D_8018D120; @@ -7635,14 +7635,14 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80053D74.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800452A4(s32, ?, ?); // extern -? func_8004B614(?, ?, ?, ?, s32, s32, s32); // extern -? func_80053D74(s32, s32, ?); // extern -extern ? D_0D007E98; +void func_800452A4(s32, ?, ?); // extern +void func_8004B614(?, ?, ?, ?, s32, s32, s32); // extern +void func_80053D74(s32, s32, ?); // extern +extern Gfx D_0D007E98; extern ? D_800E52D0; extern s16 D_80165738; -extern ? D_80165C18; -extern ? D_80183E80; +extern struct_80165C18_entry D_80165C18; +extern s16 D_80183E80; extern s32 D_8018C630; extern s32 D_8018D4BC; extern s32 D_8018D4C0; @@ -7742,11 +7742,11 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80053E6C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, s32); // extern -? func_800431B0(void *, ? *, s32, ? *); // extern -? func_8004B1C8(s16, s16, s16, ?, s32, s32, s32); // extern -extern ? D_0D005AE0; -extern ? D_80165C18; -extern ? D_80183E80; +void func_800431B0(void *, ? *, s32, ? *); // extern +void func_8004B1C8(s16, s16, s16, ?, s32, s32, s32); // extern +extern Vtx D_0D005AE0; +extern struct_80165C18_entry D_80165C18; +extern s16 D_80183E80; extern s32 D_8018D120; void func_800540CC(s32 arg0, s32 arg1) { @@ -7774,16 +7774,16 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800540CC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s32 func_80041980(? *, s32, ?); // extern -? func_8004477C(? *, ?, ?, void **); // extern -? func_8004B72C(?, ?, ?, ?, s32, s32, s32); // extern -? func_800540CC(s32, s32); // extern -extern ? D_0D007AE0; -extern ? D_0D029458; -extern ? D_801635A4; +void func_8004477C(? *, ?, ?, void **); // extern +void func_8004B72C(?, ?, ?, ?, s32, s32, s32); // extern +void func_800540CC(s32, s32); // extern +extern Gfx D_0D007AE0; +extern s8 D_0D029458; +extern f32 D_801635A4; extern s32 D_801636A0; extern ? D_801636B0; extern s32 D_801637AC; -extern ? D_80183E80; +extern s16 D_80183E80; extern s32 D_8018C3F0; extern ? D_8018C5F0; extern s32 D_8018C630; @@ -7831,11 +7831,11 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800541BC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, s32); // extern -? func_800431B0(void *, ? *, s32, ? *); // extern -? func_8004B1C8(s16, s16, s16, s16, s32, s32, s32); // extern -extern ? D_0D005AE0; -extern ? D_80165C18; -extern ? D_80183E80; +void func_800431B0(void *, ? *, s32, ? *); // extern +void func_8004B1C8(s16, s16, s16, s16, s32, s32, s32); // extern +extern Vtx D_0D005AE0; +extern struct_80165C18_entry D_80165C18; +extern s16 D_80183E80; extern s32 D_8018D120; void func_80054324(s32 arg0, s32 arg1) { @@ -7865,16 +7865,16 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054324.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s32 func_80041980(? *, s32, ?); // extern -? func_8004477C(? *, ?, ?, void **); // extern -? func_8004B72C(?, ?, ?, ?, s32, s32, s32); // extern -? func_80054324(s32, s32); // extern -extern ? D_0D007AE0; -extern ? D_0D029458; +void func_8004477C(? *, ?, ?, void **); // extern +void func_8004B72C(?, ?, ?, ?, s32, s32, s32); // extern +void func_80054324(s32, s32); // extern +extern Gfx D_0D007AE0; +extern s8 D_0D029458; extern ? D_801637C4; extern s32 D_801637E8; extern ? D_801637F0; extern s32 D_80163814; -extern ? D_80183E80; +extern s16 D_80183E80; extern s32 D_8018C3F0; extern ? D_8018C5F0; extern s32 D_8018C630; @@ -7922,12 +7922,12 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054414.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, s32); // extern -? func_800431B0(void *, ? *, s32, ? *); // extern -? func_8004B138(?, s16, ?, s16); // extern -? func_8004B72C(?, s16, ?, s16, s32, s32, s32); // extern -extern ? D_0D005AE0; -extern ? D_80165C18; -extern ? D_80183E80; +void func_800431B0(void *, ? *, s32, ? *); // extern +void func_8004B138(?, s16, ?, s16); // extern +void func_8004B72C(?, s16, ?, s16, s32, s32, s32); // extern +extern Vtx D_0D005AE0; +extern struct_80165C18_entry D_80165C18; +extern s16 D_80183E80; extern s32 D_8018D120; void func_8005457C(s32 arg0, s32 arg1) { @@ -7952,16 +7952,16 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8005457C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004477C(void *, ?, ?, void **); // extern -? func_8004B414(?, ?, ?, ?); // extern -? func_8005457C(s32, s32); // extern -extern ? D_0D007AE0; -extern ? D_0D02BC58; +void func_8004477C(void *, ?, ?, void **); // extern +void func_8004B414(?, ?, ?, ?); // extern +void func_8005457C(s32, s32); // extern +extern Gfx D_0D007AE0; +extern s8 D_0D02BC58; extern s32 D_80165598; -extern ? D_80165C18; -extern ? D_80183E80; +extern struct_80165C18_entry D_80165C18; +extern s16 D_80183E80; extern s32 D_8018C1B0; -extern ? D_8018C3B0; +extern UnkActorInner D_8018C3B0; void func_80054664(s32 arg0) { @@ -7995,11 +7995,11 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054664.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, s32); // extern -? func_800431B0(void *, ? *, s32, ? *); // extern -? func_8004B1C8(?, ?, ?, ?, s32, s32, s32); // extern -extern ? D_0D005AE0; -extern ? D_80165C18; -extern ? D_80183E80; +void func_800431B0(void *, ? *, s32, ? *); // extern +void func_8004B1C8(?, ?, ?, ?, s32, s32, s32); // extern +extern Vtx D_0D005AE0; +extern struct_80165C18_entry D_80165C18; +extern s16 D_80183E80; extern s32 D_8018D120; void func_8005477C(s32 arg0, s32 arg1, s32 arg2) { @@ -8047,18 +8047,18 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8005477C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004477C(void *, ?, ?, void **); // extern -? func_8004B72C(?, ?, ?, ?, s32, s32, s32); // extern -? func_8005477C(s32, u8, s32); // extern +void func_8004477C(void *, ?, ?, void **); // extern +void func_8004B72C(?, ?, ?, ?, s32, s32, s32); // extern +void func_8005477C(s32, u8, s32); // extern s32 func_8007223C(s32, ?); // extern -? func_8008A364(s32, s32, ?, ?); // extern -extern ? D_0D007AE0; -extern ? D_0D02BC58; +u32 func_8008A364(s32, s32, ?, ?); // extern +extern Gfx D_0D007AE0; +extern s8 D_0D02BC58; extern s32 D_80165598; -extern ? D_80165C18; -extern ? D_80183E80; +extern struct_80165C18_entry D_80165C18; +extern s16 D_80183E80; extern s32 D_8018C870; -extern ? D_8018C970; +extern s32 D_8018C970; void func_80054938(s32 arg0) { @@ -8106,12 +8106,12 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054938.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, s32); // extern s16 func_800418E8(f32, f32, s32); // extern -? func_80042E00(void *, ? *, s32); // extern -? func_8004B138(s16, s16, s16, s16); // extern -extern ? D_0D005AE0; -extern ? D_0D006940; -extern ? D_80165C18; -extern ? D_80183E80; +void func_80042E00(void *, ? *, s32); // extern +void func_8004B138(s16, s16, s16, s16); // extern +extern Vtx D_0D005AE0; +extern Gfx D_0D006940; +extern struct_80165C18_entry D_80165C18; +extern s16 D_80183E80; void func_80054AFC(s32 arg0, s32 arg1) { @@ -8140,11 +8140,11 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054AFC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800444B0(s32, ?, ?); // extern -? func_8004B35C(?, ?, ?, ?); // extern -? func_80054AFC(s32, s32); // extern -extern ? D_0D007AE0; -extern ? D_80165C18; +void func_800444B0(s32, ?, ?); // extern +void func_8004B35C(?, ?, ?, ?); // extern +void func_80054AFC(s32, s32); // extern +extern Gfx D_0D007AE0; +extern struct_80165C18_entry D_80165C18; extern s16 D_80183E80; extern s32 D_8018C630; extern ? D_8018C830; @@ -8183,12 +8183,12 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054BE8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, ? *, s32); // extern -? func_80048130(void *, ? *, s32, s32, s32, ? *, s32, s32, s32, s32, s32); // extern +void func_80048130(void *, ? *, s32, s32, s32, ? *, s32, s32, s32, s32, s32); // extern s32 func_8007223C(s32, ?); // extern -? func_8008A364(?, ?); // extern -extern ? D_0D0062B0; -extern ? D_80165C18; -extern ? D_80183E80; +u32 func_8008A364(?, ?); // extern +extern Vtx D_0D0062B0; +extern struct_80165C18_entry D_80165C18; +extern s16 D_80183E80; void func_80054D00(s32 arg0, s32 arg1) { s32 sp3C; @@ -8215,12 +8215,12 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054D00.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004A9B8(f32, ? *); // extern +void func_8004A9B8(f32, ? *); // extern s32 func_8007223C(?); // extern extern f64 D_800EE080; -extern ? D_80165C18; -extern ? D_80183E50; -extern ? D_80183E70; +extern struct_80165C18_entry D_80165C18; +extern f32 D_80183E50; +extern Vec3f D_80183E70; void func_80054E10(s32 arg0) { void *sp1C; @@ -8246,7 +8246,7 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054E10.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80054E10(s32); // extern +void func_80054E10(s32); // extern extern s32 D_8018C1B0; extern ? D_8018C22C; @@ -8268,14 +8268,14 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054EB8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, s32); // extern -? func_80043104(s32); // extern -? func_80043D50(? *, ?, ?); // extern +void func_80043104(s32); // extern +void func_80043D50(? *, ?, ?); // extern s32 func_8007223C(s32, ?); // extern -? func_8008A364(s32, s32, ?, ?); // extern -extern ? D_06013670; -extern ? D_0D006980; -extern ? D_0D0079C8; -extern ? D_80165C18; +u32 func_8008A364(s32, s32, ?, ?); // extern +extern s32 D_06013670; +extern Gfx D_0D006980; +extern Gfx D_0D0079C8; +extern struct_80165C18_entry D_80165C18; extern s32 D_8018C3F0; extern ? D_8018C5F0; extern s32 D_8018D120; @@ -8326,9 +8326,9 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80054F04.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80054D00(s32, s32); // extern -? func_80054EB8(s32); // extern -? func_80054F04(s32); // extern +void func_80054D00(s32, s32); // extern +void func_80054EB8(s32); // extern +void func_80054F04(s32); // extern extern s32 D_80183EA0; extern ? D_80183EC0; extern s32 D_80183F28; @@ -8372,10 +8372,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800550A4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_80004DFC(s32, s32, ?, s16); // extern -? func_80042E00(void *, void *, s32, void *); // extern -extern ? D_0D0077A0; +void func_80042E00(void *, void *, s32, void *); // extern +extern Gfx D_0D0077A0; extern u16 D_800DC5FC; -extern ? D_80165C18; +extern struct_80165C18_entry D_80165C18; void func_80055164(s32 arg0) { @@ -8406,9 +8406,9 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055164.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80055164(s32); // extern +void func_80055164(s32); // extern s32 func_8007223C(s32, ?); // extern -? func_8008A364(s32, s32, ?, ?); // extern +u32 func_8008A364(s32, s32, ?, ?); // extern extern s32 D_80183EA0; extern ? D_80183EB0; @@ -8435,10 +8435,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055228.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_80004DFC(s32, s32, ?, s16); // extern -? func_80042E00(void *, void *, s32); // extern -extern ? D_0D0077D0; +void func_80042E00(void *, void *, s32); // extern +extern Gfx D_0D0077D0; extern u16 D_800DC5FC; -extern ? D_80165C18; +extern struct_80165C18_entry D_80165C18; void func_800552BC(s32 arg0) { @@ -8469,9 +8469,9 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800552BC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800552BC(s32); // extern +void func_800552BC(s32); // extern s32 func_8007223C(s32, ?); // extern -? func_800722A4(s32, ?); // extern +void func_800722A4(s32, ?); // extern s32 func_8008A364(s32, s32, ?, ?); // extern extern s8 D_80165908; extern s32 D_80183F28; @@ -8503,10 +8503,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055380.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, s32); // extern -? func_800480B4(void *, void *, s32, s32, s32, ? *, s32, s32, s32, s32); // extern -? func_8004A6EC(?); // extern -extern ? D_0D0060B0; -extern ? D_80165C18; +void func_800480B4(void *, void *, s32, s32, s32, ? *, s32, s32, s32, s32); // extern +void func_8004A6EC(?); // extern +extern Vtx D_0D0060B0; +extern struct_80165C18_entry D_80165C18; void func_80055458(s32 arg0, s32 arg1) { s32 sp34; @@ -8528,9 +8528,9 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055458.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80055458(s32, s32); // extern +void func_80055458(s32, s32); // extern s32 func_8007223C(s32, ?); // extern -? func_8008A364(s32, s32, ?, ?); // extern +u32 func_8008A364(s32, s32, ?, ?); // extern extern s32 D_80183EA0; extern ? D_80183EC8; @@ -8557,9 +8557,9 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055528.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, s32); // extern -? func_800480B4(void *, void *, s32, s32, s32, s32, s32, s32, s32, s32); // extern -? func_8004A870(?); // extern -extern ? D_80165C18; +void func_800480B4(void *, void *, s32, s32, s32, s32, s32, s32, s32, s32); // extern +void func_8004A870(?); // extern +extern struct_80165C18_entry D_80165C18; void func_800555BC(s32 arg0, s32 arg1) { s32 sp34; @@ -8581,9 +8581,9 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800555BC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800555BC(s32, s32); // extern -? func_800721C0(s32, ?); // extern -? func_800721E8(s32, ?); // extern +void func_800555BC(s32, s32); // extern +void func_800721C0(s32, ?); // extern +void func_800721E8(s32, ?); // extern s32 func_8007223C(s32, ?); // extern u32 func_8008A364(s32, s32, ?, ?); // extern extern s32 D_80183F28; @@ -8627,14 +8627,14 @@ UNUSED void func_800557AC() { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80004DFC(s32, s32, u8, s8); // extern -? func_80042E00(void *, void *, s32); // extern -? func_80042F70(f32 *, void *, s32); // extern -? func_8004A7AC(s32, ?); // extern +s16 func_80004DFC(s32, s32, u8, s8); // extern +void func_80042E00(void *, void *, s32); // extern +void func_80042F70(f32 *, void *, s32); // extern +void func_8004A7AC(s32, ?); // extern s32 func_8007223C(?); // extern s32 func_80072320(s32, ?); // extern -extern ? D_0D0077D0; -extern ? D_80165C18; +extern Gfx D_0D0077D0; +extern struct_80165C18_entry D_80165C18; void func_800557B4(s32 arg0, u32 arg1, u32 arg2) { @@ -8682,11 +8682,11 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800557B4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800557B4(s32, s32, ?); // extern +void func_800557B4(s32, s32, ?); // extern s32 func_8007223C(s32, ?); // extern s32 func_80072320(s32, ?); // extern s32 func_8008A364(s32, s32, s32, ?); // extern -extern ? D_80165C18; +extern struct_80165C18_entry D_80165C18; extern s32 D_80183EA0; extern ? D_80183EDC; @@ -8747,17 +8747,17 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8005592C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80004DFC(s32, s32, ?, s8); // extern +s16 func_80004DFC(s32, s32, ?, s8); // extern s16 func_800418AC(f32, f32, ? *, ? *, s32); // extern -? func_80042E00(void *, void *, s32); // extern -? func_800468E0(? *, ? *, ?, ? *, ? *, s32, s32, s32, s32, s32); // extern +void func_80042E00(void *, void *, s32); // extern +void func_800468E0(? *, ? *, ?, ? *, ? *, s32, s32, s32, s32, s32); // extern s32 func_8007223C(?, s32); // extern extern ? D_06012028; -extern ? D_0D0062B0; -extern ? D_0D0077D0; -extern ? D_80165C18; -extern ? D_80183E40; -extern ? D_80183E80; +extern Vtx D_0D0062B0; +extern Gfx D_0D0077D0; +extern struct_80165C18_entry D_80165C18; +extern f32 D_80183E40; +extern s16 D_80183E80; void func_80055AB8(s32 arg0, s32 arg1) { @@ -8802,9 +8802,9 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055AB8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80055AB8(s32, s32); // extern +void func_80055AB8(s32, s32); // extern s32 func_8007223C(s32, ?); // extern -? func_8008A1D0(s32, s32, ?, ?); // extern +void func_8008A1D0(s32, s32, ?, ?); // extern extern s32 D_80183F28; extern ? D_80183F34; @@ -8831,16 +8831,16 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055C38.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s32 func_800418AC(f32, f32, void *, ? *, s32); // extern -? func_80043328(void *, ? *, s32, ? *); // extern -? func_8004A6EC(s32, f32); // extern +void func_80043328(void *, ? *, s32, ? *); // extern +void func_8004A6EC(s32, f32); // extern s32 func_80072270(s32, ?); // extern -? func_8008A454(?); // extern +void func_8008A454(?); // extern extern ? D_0600F650; extern ? D_0600F960; extern ? D_0600FA20; extern ? D_0600FBE0; -extern ? D_80165C18; -extern ? D_80183E80; +extern struct_80165C18_entry D_80165C18; +extern s16 D_80183E80; void func_80055CCC(s32 arg0, s32 arg1) { @@ -8884,10 +8884,10 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055CCC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80055CCC(s32, s32); // extern -? func_800721E8(s32, ?); // extern +void func_80055CCC(s32, s32); // extern +void func_800721E8(s32, ?); // extern s32 func_8007223C(s32, ?); // extern -? func_8008A1D0(s32, s32, ?, ?); // extern +void func_8008A1D0(s32, s32, ?, ?); // extern extern s32 D_80183EA0; void func_80055E68(s32 arg0) { @@ -8912,8 +8912,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055E68.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80043220(void *, void *, s32, s32); // extern -extern ? D_80165C18; +void func_80043220(void *, void *, s32, s32); // extern +extern struct_80165C18_entry D_80165C18; void func_80055EF4(s32 arg0, ? arg1) { void *temp_v0; @@ -8929,9 +8929,9 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055EF4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80055EF4(s32, s32); // extern +void func_80055EF4(s32, s32); // extern extern s32 D_80183EA0; -extern ? D_80183EAC; +extern s32 D_80183EAC; void func_80055F48(s32 arg0) { s32 *temp_s0; @@ -8950,12 +8950,12 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80055F48.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 5bd751fca3befef73d6a2e20d84a88cc918a77fe -? func_80022180(Mtx *, ? *); /* extern */ -? func_800425D0(? *, void *, void *, s32); /* extern */ -? func_802B4FF8(? *, ?); /* extern */ -? mtxf_identity(? *); /* extern */ +void func_80022180(Mtx *, ? *); /* extern */ +void func_800425D0(? *, void *, void *, s32); /* extern */ +s32 func_802B4FF8(? *, ?); /* extern */ +void mtxf_identity(? *); /* extern */ extern Gfx D_0D0077A0[]; -extern ? D_80165C18; +extern struct_80165C18_entry D_80165C18; extern s32 D_8018D120; void func_80055FA0(s32 arg0, s32 arg1) { @@ -8992,15 +8992,15 @@ void func_80056160(s32 arg0) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800480B4(void *, void *, s32, s32, s32, ? *, s32, s32, s32, s32); // extern +void func_800480B4(void *, void *, s32, s32, s32, ? *, s32, s32, s32, s32); // extern s32 func_80072270(s32, ?); // extern s16 func_800872D8(s32, s32); // extern s32 func_8008A140(s32, s32, ?); // extern -extern ? D_0D0060B0; -extern ? D_80165C18; +extern Vtx D_0D0060B0; +extern struct_80165C18_entry D_80165C18; extern s32 D_80183EA0; extern ? D_80183EC8; -extern ? D_8018E838; +extern s8 D_8018E838; void func_80056188(s32 arg0) { s32 *temp_s2; @@ -9030,18 +9030,18 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80056188.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80042E00(? *, ? *, ?); // extern -? func_80044BF8(void *, ?, ?); // extern -? func_8004B138(s32, s32, s32, ?); // extern -extern ? D_0D005AE0; -extern ? D_0D006940; -extern ? D_0D02AC58; +void func_80042E00(? *, ? *, ?); // extern +void func_80044BF8(void *, ?, ?); // extern +void func_8004B138(s32, s32, s32, ?); // extern +extern Vtx D_0D005AE0; +extern Gfx D_0D006940; +extern s8 D_0D02AC58; extern ? D_800E46F8; extern s32 D_80165860; extern s32 D_8016586C; extern s32 D_80165878; -extern ? D_80183E40; -extern ? D_80183E80; +extern f32 D_80183E40; +extern s16 D_80183E80; void func_800562E4(s32 arg0, s32 arg1, ? arg2) { @@ -9078,20 +9078,20 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800562E4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, s32); // extern -? func_80042E00(? *, ? *, ?); // extern -? func_80047270(? *, void *, ? *, ?, s32, s32, s32); // extern -? func_8004B310(?); // extern -? func_8004B414(?, ?, ?, ?); // extern -? func_800562E4(s32, s32, ?); // extern -extern ? D_0D005AE0; -extern ? D_0D007B00; -extern ? D_0D007E98; -extern ? D_0D029858; -extern ? D_0D02A858; +void func_80042E00(? *, ? *, ?); // extern +void func_80047270(? *, void *, ? *, ?, s32, s32, s32); // extern +void func_8004B310(?); // extern +void func_8004B414(?, ?, ?, ?); // extern +void func_800562E4(s32, s32, ?); // extern +extern Vtx D_0D005AE0; +extern Gfx D_0D007B00; +extern Gfx D_0D007E98; +extern s8 D_0D029858; +extern s8 D_0D02A858; extern s32 D_801655CC; -extern ? D_80165C18; -extern ? D_80183E40; -extern ? D_80183E80; +extern struct_80165C18_entry D_80165C18; +extern f32 D_80183E40; +extern s16 D_80183E80; extern s32 D_8018D400; @@ -9150,15 +9150,15 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800563DC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800431B0(? *, ? *, ?, ? *); // extern -? func_80043D50(? *, ?, ?); // extern -? func_8004B310(?, void **); // extern -extern ? D_0D005770; -extern ? D_0D0079E8; -extern ? D_0D02AA58; -extern ? D_80165C18; -extern ? D_80183E40; -extern ? D_80183E80; +void func_800431B0(? *, ? *, ?, ? *); // extern +void func_80043D50(? *, ?, ?); // extern +void func_8004B310(?, void **); // extern +extern Vtx D_0D005770; +extern Gfx D_0D0079E8; +extern s8 D_0D02AA58; +extern struct_80165C18_entry D_80165C18; +extern f32 D_80183E40; +extern s16 D_80183E80; void func_8005669C(s32 arg0, ? arg1, ? arg2) { @@ -9197,12 +9197,12 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8005669C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80022180(void *, ? *, s32 *); // extern -? func_80042A20(? *, f32 *, ? *, ?, f32); // extern -extern ? D_0D007B98; +void func_80022180(void *, ? *, s32 *); // extern +void func_80042A20(? *, f32 *, ? *, ?, f32); // extern +extern Gfx D_0D007B98; extern f64 D_800EE088; -extern ? D_80165C18; -extern ? D_80183E50; +extern struct_80165C18_entry D_80165C18; +extern f32 D_80183E50; extern s32 D_8018D120; @@ -9234,9 +9234,9 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800568A0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -//? func_800723A4(s32, ?); // extern -//extern ? D_80165CB8; -//extern ? D_80183DD8; +//void func_800723A4(s32, ?); // extern +//extern s16 D_80165CB8; +//extern s32 D_80183DD8; //void func_800723A4(s32,s32); void func_800569F4(s32 arg0) { s32 temp_a0 = D_80183DD8[arg0]; @@ -9250,9 +9250,9 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_800569F4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -//? func_800723A4(s32, ?); // extern -//extern ? D_80165CB8; -//extern ? D_80183DD8; +//void func_800723A4(s32, ?); // extern +//extern s16 D_80165CB8; +//extern s32 D_80183DD8; void func_80056A40(s32 arg0, s32 arg1) { s32 sp1C; @@ -9273,10 +9273,10 @@ void func_80056A94(s32 arg0) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800563DC(s32, s32, s16); // extern -? func_8005669C(s32, s32, s16); // extern -? func_800568A0(s32, s32); // extern -extern ? D_80165C18; +void func_800563DC(s32, s32, s16); // extern +void func_8005669C(s32, s32, s16); // extern +void func_800568A0(s32, s32); // extern +extern struct_80165C18_entry D_80165C18; extern s32 D_80183DD8; void func_80056AC0(s32 arg0) { @@ -9363,13 +9363,13 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80056BF0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, s32); // extern -? func_800431B0(f32 *, ? *, ?, ? *); // extern -? func_80043D50(? *, ?, ?); // extern -extern ? D_0D005770; -extern ? D_0D0079C8; -extern ? D_0D02AA58; +void func_800431B0(f32 *, ? *, ?, ? *); // extern +void func_80043D50(? *, ?, ?); // extern +extern Vtx D_0D005770; +extern Gfx D_0D0079C8; +extern s8 D_0D02AA58; extern ? D_80163DE8; -extern ? D_80183E80; +extern s16 D_80183E80; void func_80056E24(s32 arg0, s32 arg1) { @@ -9424,12 +9424,12 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80056E24.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80022180(void *, ? *, s32 *); // extern -? func_80042A20(? *, void *, ? *, ?, f32); // extern -extern ? D_0D007B98; +void func_80022180(void *, ? *, s32 *); // extern +void func_80042A20(? *, void *, ? *, ?, f32); // extern +extern Gfx D_0D007B98; extern ? D_80163DE8; -extern ? D_80164038; -extern ? D_80183E50; +extern UnkActorInner D_80164038; +extern f32 D_80183E50; extern s32 D_8018D120; @@ -9462,17 +9462,17 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80056FCC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s16 func_800418AC(f32, f32, s32); // extern -? func_800563DC(s32, s32, ?); // extern -? func_80056E24(s32, s32); // extern -? func_80056FCC(s32); // extern -? func_800721C0(s32, ?); // extern -? func_800721E8(s32, ?); // extern +void func_800563DC(s32, s32, ?); // extern +void func_80056E24(s32, s32); // extern +void func_80056FCC(s32); // extern +void func_800721C0(s32, ?); // extern +void func_800721E8(s32, ?); // extern s32 func_8007223C(s32, ?); // extern u32 func_8008A364(s32, s32, ?, ?); // extern extern ? D_80163DE8; -extern ? D_80165C18; +extern struct_80165C18_entry D_80165C18; extern s32 D_80183DD8; -extern ? D_80183E80; +extern s16 D_80183E80; void func_80057114(s32 arg0) { s32 temp_s0; @@ -9588,8 +9588,8 @@ void func_80057454(s32 *arg0, s32 *arg1) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800573E4(s32, s32, s8); // extern -? func_80057454(s32 *, s32 *); // extern +void func_800573E4(s32, s32, s8); // extern +void func_80057454(s32 *, s32 *); // extern extern ? D_800E5628; void debug_print_string(s32 *arg0, s32 *arg1, s8 *arg2) { @@ -9623,8 +9623,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/debug_print_string.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800573E4(s32, s32, s8); // extern -? func_80057454(s32 *, s32 *); // extern +void func_800573E4(s32, s32, s8); // extern +void func_80057454(s32 *, s32 *); // extern extern s8 D_800E5655; extern s8 D_801657B8; extern s8 D_801657B9; @@ -9685,8 +9685,8 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/debug_number_sign_check.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800573E4(s32, s32, s8); // extern -? func_80057454(s32 *, s32 *); // extern +void func_800573E4(s32, s32, s8); // extern +void func_80057454(s32 *, s32 *); // extern extern s8 D_801657B8; extern s8 D_801657B9; diff --git a/src/code_80057C60.c b/src/code_80057C60.c index 030b25f57..d38cbbcb4 100644 --- a/src/code_80057C60.c +++ b/src/code_80057C60.c @@ -593,10 +593,10 @@ void func_8005902C(void) { void func_800590D4(void) { if (D_8018D2A4 != 0) { - if (gModeSelection != 3) { + if (gModeSelection != BATTLE) { switch (gPlayerCountSelection1) { case 1: - if (gModeSelection != 1) { + if (gModeSelection != TIME_TRIALS) { func_8004E800(0); break; } @@ -666,10 +666,10 @@ void func_80059358(void) { #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? func_8004CB60(s16, s16, ? *); /* extern */ -? func_8004E638(?); /* extern */ -? func_8004FA78(?); /* extern */ -? func_8004FC78(s16, s16, s8); /* extern */ +void func_8004CB60(s16, s16, ? *); /* extern */ +void func_8004E638(?); /* extern */ +void func_8004FA78(?); /* extern */ +void func_8004FC78(s16, s16, s8); /* extern */ extern ? D_0D00A958; extern s8 D_801657B0; @@ -693,13 +693,13 @@ void func_800593F0(void) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004CB60(s16, s16, ? *); // extern -? func_8004E638(?); // extern -? func_8004FA78(?); // extern -? func_8004FC78(s16, s16, s8); // extern +void func_8004CB60(s16, s16, ? *); // extern +void func_8004E638(?); // extern +void func_8004FA78(?); // extern +void func_8004FC78(s16, s16, s8); // extern extern ? D_0D00A958; extern s8 D_801657B0; -extern ? D_8018CA70; +extern struct_8018CA70_entry D_8018CA70; void func_800593F8(void) { if (D_801657B0 == 0) { @@ -745,14 +745,14 @@ void func_80059530(void) { #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? func_80047910(s16, s16, ?, ?, ? *, ? *, ? *, s32, s32, s32, s32); /* extern */ -? func_8004CB60(s16, s16, ? *); /* extern */ -? func_8004E6C4(s32); /* extern */ -? func_8004FC78(s16, s16, s8); /* extern */ -extern ? D_0D005AE0; +void func_80047910(s16, s16, ?, ?, ? *, ? *, ? *, s32, s32, s32, s32); /* extern */ +void func_8004CB60(s16, s16, ? *); /* extern */ +void func_8004E6C4(s32); /* extern */ +void func_8004FC78(s16, s16, s8); /* extern */ +extern Vtx D_0D005AE0; extern ? D_0D00A958; -extern ? D_0D01B4D8; -extern ? D_0D01D6D8; +extern s8 D_0D01B4D8; +extern s8 D_0D01D6D8; extern s32 D_80165608; extern s8 D_801657E4; extern s8 D_801657F8; @@ -763,7 +763,7 @@ void func_80059560(s32 playerId) { struct_8018CA70_entry *temp_v0; struct_8018CA70_entry *temp_v0_2; - if (gModeSelection != 3) { + if (gModeSelection != BATTLE) { if ((D_801657F8 != 0) && (D_8018D188 != 0)) { temp_v0 = &D_8018CA70[playerId]; sp3C = temp_v0; @@ -930,13 +930,13 @@ void func_80059A88(s32 arg0) { #ifdef NON_MATCHING //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -//? func_80059820(?); // extern -//? func_8005995C(); // extern -//? func_80059A88(?); // extern -//? func_8005A71C(); // extern -//? func_800892E0(s32); // extern +//void func_80059820(?); // extern +//void func_8005995C(); // extern +//void func_80059A88(?); // extern +//void func_8005A71C(); // extern +//void func_800892E0(s32); // extern s32 func_8008A890(Camera*); // extern -//? func_8008C1D8(? *); // extern +//void func_8008C1D8(? *); // extern extern u16 D_800DC5FC; extern s32 D_80165678; extern s16 D_8018CF68[]; @@ -969,7 +969,7 @@ void func_80059AC8(void) { case SCREEN_MODE_1P: if (gGamestate != 9) { func_80059A88(0); - if (gModeSelection == 1) { + if (gModeSelection == TIME_TRIALS) { func_8005995C(); } } else { @@ -1000,11 +1000,11 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80059AC8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_8005A3C0(); /* extern */ +void func_8005A3C0(); /* extern */ extern s16 gGPCurrentRacePlayerIdByRank; -extern ? gPlayerPositions; +extern s32 gPlayerPositions; extern ? D_801643D8; -extern ? D_8018CF90; +extern s16 D_8018CF90; extern ? D_8018CF98; void func_80059C50(void) { @@ -1173,14 +1173,14 @@ void func_8005A070(void) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? u16_step_up_towards(s32, ?, ?); // extern -? u16_step_down_towards(s32, ?, ?); // extern -? f32_step_towards(void *, ?, ?, s32); // extern -? func_80087D24(s32, ?, ?, ?); // extern +s32 u16_step_up_towards(s32, ?, ?); // extern +s32 u16_step_down_towards(s32, ?, ?); // extern +s32 f32_step_towards(void *, ?, ?, s32); // extern +s32 func_80087D24(s32, ?, ?, ?); // extern extern f32 D_800EE1E0; -extern ? D_80165C18; -extern ? D_8018CE24; -extern ? gLapCountByPlayerId; +extern struct_80165C18_entry D_80165C18; +extern s32 D_8018CE24; +extern s32 gLapCountByPlayerId; void func_8005A14C(s32 arg0) { s32 sp2C; @@ -1264,7 +1264,7 @@ void func_8005A380(void) { #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_8006F824(?, s8, s32); /* extern */ +void func_8006F824(?, s8, s32); /* extern */ extern s32 gGamestate; extern u16 D_800DC51C; extern s8 D_801657E4; @@ -1272,7 +1272,7 @@ extern s8 D_801657E6; extern s8 D_801657E8; extern s8 D_801657F0; extern s8 D_801657F8; -extern ? D_80165800; +extern s8 D_80165800; extern s32 D_8018D204; void func_8005A3C0(s32 arg2) { @@ -1374,30 +1374,30 @@ void func_8005A71C(void) { #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_80074EE8(); /* extern */ -? func_80075838(); /* extern */ -? func_80075CA8(); /* extern */ -? func_80076B84(); /* extern */ -? func_80076F2C(); /* extern */ -? func_80077C9C(); /* extern */ -? func_80078838(); /* extern */ -? func_8007C2F8(?); /* extern */ -? func_8007C340(); /* extern */ -? func_8007DB44(); /* extern */ -? func_8007E1AC(); /* extern */ -? func_8007E4C4(); /* extern */ -? func_80081208(); /* extern */ -? func_800821FC(); /* extern */ -? func_80082870(); /* extern */ -? func_80082E5C(); /* extern */ -? func_80083080(); /* extern */ -? func_800834B8(); /* extern */ -? func_80083D60(); /* extern */ -? func_800842C8(); /* extern */ -? func_80085214(); /* extern */ -? func_800857C0(); /* extern */ -? func_80085AA8(); /* extern */ -? func_800861E0(); /* extern */ +void func_80074EE8(); /* extern */ +void func_80075838(); /* extern */ +void func_80075CA8(); /* extern */ +void func_80076B84(); /* extern */ +void func_80076F2C(); /* extern */ +void func_80077C9C(); /* extern */ +void func_80078838(); /* extern */ +void func_8007C2F8(?); /* extern */ +void func_8007C340(); /* extern */ +void func_8007DB44(); /* extern */ +void func_8007E1AC(); /* extern */ +void func_8007E4C4(); /* extern */ +void func_80081208(); /* extern */ +void func_800821FC(); /* extern */ +void func_80082870(); /* extern */ +void func_80082E5C(); /* extern */ +void func_80083080(); /* extern */ +void func_800834B8(); /* extern */ +void func_80083D60(); /* extern */ +void func_800842C8(); /* extern */ +void func_80085214(); /* extern */ +void func_800857C0(); /* extern */ +void func_80085AA8(); /* extern */ +void func_800861E0(); /* extern */ u16 gCurrentCourseId; /* unable to generate initializer */ void func_8005A74C(void) { @@ -1542,7 +1542,7 @@ void func_8005AAF0(void) { } void func_8005AB20(void) { - if ((gModeSelection == 0) && (gPlayerCountSelection1 == 1)) { + if ((gModeSelection == GRAND_PRIX) && (gPlayerCountSelection1 == 1)) { func_8005AA6C(0x14); } } @@ -1554,7 +1554,7 @@ extern s16 D_8016579E; extern u8 D_801657E7; extern ? D_8018CAAE; extern ? D_8018CAB0; -extern ? D_8018CAB8; +extern s16 D_8018CAB8; extern ? D_8018CABE; extern ? D_8018CAC0; extern ? D_8018CAC2; @@ -1944,17 +1944,17 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005AB60.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? s16_step_towards(? *, ?, ?); /* extern */ -? f32_step_towards(f32 *, f32, f32); /* extern */ +s32 s16_step_towards(? *, ?, ?); /* extern */ +s32 f32_step_towards(f32 *, f32, f32); /* extern */ extern ? D_8018CAC0; extern ? D_8018CAC2; extern ? D_8018CAC4; extern ? D_8018CAC6; -extern ? D_8018D028; +extern f32 D_8018D028; extern f32 D_8018D050; -extern ? D_8018D070; +extern s16 D_8018D070; extern ? D_8018D078; -extern ? D_8018D0C8; +extern f32 D_8018D0C8; void func_8005B7A0(void) { f32 *temp_s1; @@ -1996,14 +1996,14 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005B7A0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? f32_step_towards(f32 *, f32, ?32); /* extern */ -? func_8005AA4C(); /* extern */ -? func_8005AA6C(?); /* extern */ -? func_8005AA80(); /* extern */ -? func_8005AA94(?); /* extern */ -? func_8005AAF0(); /* extern */ -? func_8005AB60(); /* extern */ -? func_8005B7A0(); /* extern */ +s32 f32_step_towards(f32 *, f32, ?32); /* extern */ +void func_8005AA4C(); /* extern */ +void func_8005AA6C(?); /* extern */ +void func_8005AA80(); /* extern */ +void func_8005AA94(?); /* extern */ +void func_8005AAF0(); /* extern */ +void func_8005AB60(); /* extern */ +void func_8005B7A0(); /* extern */ extern s8 D_801657E2; extern f32 D_8018D028; extern f32 D_8018D02C; @@ -2021,7 +2021,7 @@ extern f32 D_8018D060; extern f32 D_8018D064; extern f32 D_8018D068; extern f32 D_8018D06C; -extern ? D_8018D070; +extern s16 D_8018D070; extern ?32 D_8018D078; extern f32 D_8018D07C; extern f32 D_8018D080; @@ -2030,7 +2030,7 @@ extern f32 D_8018D088; extern f32 D_8018D08C; extern f32 D_8018D090; extern f32 D_8018D094; -extern ? D_8018D098; +extern s16 D_8018D098; extern f32 D_8018D0C8; extern f32 D_8018D0CC; extern f32 D_8018D0D0; @@ -2066,7 +2066,7 @@ block_76: phi_v0_3 = D_8018D1CC; break; case 0x2: - if (gModeSelection == 1) { + if (gModeSelection == TIME_TRIALS) { D_8018CA70->unk80 = 1; } D_8018CA70->unk_78 = 1; @@ -2468,8 +2468,8 @@ void func_8005C6B4(s8 arg0, s16* arg1, s16* arg2, s16* arg3) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8005C674(s8, s16 *, s16 *, s16 *); // extern -? func_8005C980(); // extern +void func_8005C674(s8, s16 *, s16 *, s16 *); // extern +void func_8005C980(); // extern extern s32 D_80165590; extern s32 D_80165594; extern s32 D_80165598; @@ -2567,13 +2567,13 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005C728.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -extern ? gGPCurrentRacePlayerIdByRank; +extern s16 gGPCurrentRacePlayerIdByRank; extern s32 gPlayerPositions; extern s32 D_80165590; extern s16 D_80165794; extern ? D_8018CF28; extern ? D_8018CF50; -extern ? D_8018CF60; +extern s16 D_8018CF60; extern ? D_8018CF98; extern s32 D_8018D314; extern s32 D_8018D3E4; @@ -2671,24 +2671,24 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005C980.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? s16_step_towards(s16 *, ?, ?, s32); /* extern */ -? f32_step_towards(f32 *, ?, ?, s32); /* extern */ -? func_80079054(s32); /* extern */ -? func_80079084(s32); /* extern */ -? func_800790B4(s32); /* extern */ -? func_800C9060(s32, ?); /* extern */ -? func_800C90F4(?, s32, s8, s32); /* extern */ +s32 s16_step_towards(s16 *, ?, ?, s32); /* extern */ +s32 f32_step_towards(f32 *, ?, ?, s32); /* extern */ +void func_80079054(s32); /* extern */ +void func_80079084(s32); /* extern */ +void func_800790B4(s32); /* extern */ +void func_800C9060(s32, ?); /* extern */ +void func_800C90F4(?, s32, s8, s32); /* extern */ extern s32 D_80165594; extern u32 D_80165638; extern u32 D_80165648; extern ? D_80165654; -extern ? D_80165658; +extern s32 D_80165658; extern s8 D_801657E3; extern s8 D_801657E4; extern s8 D_801657E5; extern s8 D_801657E6; extern s8 D_801657F0; -extern ? D_80165800; +extern s8 D_80165800; extern s32 D_8016587C; extern s8 D_80165898; extern s32 D_8018D114; @@ -2748,7 +2748,7 @@ void func_8005CB60(s32 playerId, s32 arg1) { temp_s0->someTimer = (temp_s0 + (*temp_v1 * 4))->unk14; } phi_a2 = 1; - if (gModeSelection == 1) { + if (gModeSelection == TIME_TRIALS) { temp_v0_2 = D_80165638; temp_a0_2 = temp_s0->someTimer1; if (temp_v0_2 >= temp_a0_2) { @@ -2823,7 +2823,7 @@ void func_8005CB60(s32 playerId, s32 arg1) { playerId = phi_a3; func_80079084(phi_a3); func_800C9060(playerId & 0xFF, 0x1900F015); - if ((gCurrentCourseId == 8) && (D_80165898 == 0) && (gModeSelection != 1)) { + if ((gCurrentCourseId == 8) && (D_80165898 == 0) && (gModeSelection != TIME_TRIALS)) { D_80165898 = 1; } } @@ -2832,9 +2832,8 @@ void func_8005CB60(s32 playerId, s32 arg1) { } else { playerId = temp_a3; f32_step_towards(&temp_s0->rankScaling, 0x3F800000, 0x3E000000, temp_a3); - temp_v0_6 = gScreenModeSelection; - switch (temp_v0_6) { /* irregular */ - case 0: + switch (gScreenModeSelection) { /* irregular */ + case SCREEN_MODE_1P: s16_step_towards(&temp_s0->slideRankX, 0x1C, 7, playerId); if (D_8018D1FC != 0) { s16_step_towards(&temp_s0->slideRankY, -0x28, 1); @@ -2842,11 +2841,11 @@ void func_8005CB60(s32 playerId, s32 arg1) { s16_step_towards(&temp_s0->slideRankY, -0x10, 4); } break; - case 2: + case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL: s16_step_towards(&temp_s0->slideRankX, 0x1C, 7, playerId); s16_step_towards(&temp_s0->slideRankY, -0x10, 4); break; - case 1: + case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL: s16_step_towards(&temp_s0->slideRankX, 0x1C, 7, playerId); s16_step_towards(&temp_s0->slideRankY, -0x10, 4); s16_step_towards(&temp_s0->lap1CompletionTimeX, 0xE4, 0x10); @@ -2854,7 +2853,7 @@ void func_8005CB60(s32 playerId, s32 arg1) { s16_step_towards(&temp_s0->lap3CompletionTimeX, 0xE4, 0x10); s16_step_towards(&temp_s0->totalTimeX, 0xE4, 0x10); break; - case 3: + case SCREEN_MODE_3P_4P_SPLITSCREEN: if ((playerId & 1) == 1) { s16_step_towards(&temp_s0->slideRankX, -8, 2, playerId); } else { @@ -2918,7 +2917,7 @@ void func_8005D18C(void) { //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 extern ? D_80163DE8; extern ? D_80164034; -extern ? gNearestWaypointByPlayerId; +extern u16 gNearestWaypointByPlayerId; void func_8005D1F4(s32 playerId) { ? *temp_a2; @@ -2927,7 +2926,7 @@ void func_8005D1F4(s32 playerId) { u16 temp_a0; ? *phi_a2; - if (gModeSelection == 2) { + if (gModeSelection == VERSUS) { temp_v1 = &D_8018CA70[playerId]; temp_v1->unk_74 = 0; phi_a2 = &D_80163DE8; @@ -3178,7 +3177,7 @@ void func_8005D898(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8005D898(s16, s8, s32); // extern +void func_8005D898(s16, s8, s32); // extern void func_8005DA30(s32 arg0, s16 arg1, s32 arg2, s8 arg3, s8 arg4) { void *temp_v0; @@ -3207,11 +3206,11 @@ void func_8005DAD8(UnkPlayerStruct258* arg0, s16 arg1, s16 arg2, s16 arg3) { #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? func_8005D794(f32, f32, Player *, void *, f32, f32, f32, s32, s32); /* extern */ -? func_8005D7D8(void *, ?, ?); /* extern */ -? func_8005D800(void *, ?, ?); /* extern */ -? func_8005D82C(void *, ?, ?); /* extern */ -? func_8005DAD8(void *, ?, ?, ?); /* extern */ +void func_8005D794(f32, f32, Player *, void *, f32, f32, f32, s32, s32); /* extern */ +void func_8005D7D8(void *, ?, ?); /* extern */ +void func_8005D800(void *, ?, ?); /* extern */ +void func_8005D82C(void *, ?, ?); /* extern */ +void func_8005DAD8(void *, ?, ?, ?); /* extern */ s16 random_int(u16); /* extern */ static u16 D_800E483E; /* unable to generate initializer; const */ s16 gCurrentCourseId; /* unable to generate initializer */ @@ -3575,9 +3574,9 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005DAF4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? func_8005D794(f32, f32, Player *, void *, f32, f32, f32, s32, s32); /* extern */ -? func_8005D7D8(void *, ?, ?); /* extern */ -? func_8005D800(void *, ?, ?); /* extern */ +void func_8005D794(f32, f32, Player *, void *, f32, f32, f32, s32, s32); /* extern */ +void func_8005D7D8(void *, ?, ?); /* extern */ +void func_8005D800(void *, ?, ?); /* extern */ s32 random_int(u16); /* extern */ static u16 D_800E4842; /* unable to generate initializer; const */ @@ -3651,10 +3650,10 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005EA94.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? func_8005D794(f32, Player *, void *, f32, f32, f32, s32, s32); /* extern */ -? func_8005D7D8(void *, ?, ?); /* extern */ -? func_8005D800(void *, ?, ?); /* extern */ -? func_8005DAD8(void *, ?, ?, ?); /* extern */ +void func_8005D794(f32, Player *, void *, f32, f32, f32, s32, s32); /* extern */ +void func_8005D7D8(void *, ?, ?); /* extern */ +void func_8005D800(void *, ?, ?); /* extern */ +void func_8005DAD8(void *, ?, ?, ?); /* extern */ s16 random_int(u16); /* extern */ static u16 D_800E4846; /* unable to generate initializer; const */ s16 gCurrentCourseId; /* unable to generate initializer */ @@ -3999,10 +3998,10 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005ED48.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 792017ad9d422c2467bd42686f383a5c41f41c75 -? func_8005D794(f32, Player *, void *, f32, f32, f32, s32, s32); /* extern */ -? func_8005D7D8(void *, ?, ?); /* extern */ -? func_8005D800(void *, ?, ?); /* extern */ -? func_8005DAD8(void *, ?, ?, ?); /* extern */ +void func_8005D794(f32, Player *, void *, f32, f32, f32, s32, s32); /* extern */ +void func_8005D7D8(void *, ?, ?); /* extern */ +void func_8005D800(void *, ?, ?); /* extern */ +void func_8005DAD8(void *, ?, ?, ?); /* extern */ s16 random_int(?); /* extern */ s16 gCurrentCourseId; /* unable to generate initializer */ @@ -4332,10 +4331,10 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005F90C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8005D794(void *, void *, f32, f32, f32, s32, s32); // extern -? func_8005D7D8(void *, ?, ?); // extern -? func_8005D800(void *, ?, ?); // extern -? func_80062B18(f32 *, f32 *, f32 *, ?, f32, f32, s32, s32); // extern +void func_8005D794(void *, void *, f32, f32, f32, s32, s32); // extern +void func_8005D7D8(void *, ?, ?); // extern +void func_8005D800(void *, ?, ?); // extern +void func_80062B18(f32 *, f32 *, f32 *, ?, f32, f32, s32, s32); // extern extern f32 D_800EE560; extern f64 D_800EE568; extern f32 D_800EE570; @@ -4434,10 +4433,10 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80060504.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8005D794(f32, f32, void *, void *, f32, f32, f32, s32, s32); // extern -? func_8005D7D8(void *, ?, f32); // extern -? func_8005D800(void *, ?, ?); // extern -? func_80062B18(f32 *, f32 *, f32 *, ?, f32, f32, s32, s32); // extern +void func_8005D794(f32, f32, void *, void *, f32, f32, f32, s32, s32); // extern +void func_8005D7D8(void *, ?, f32); // extern +void func_8005D800(void *, ?, ?); // extern +void func_80062B18(f32 *, f32 *, f32 *, ?, f32, f32, s32, s32); // extern extern f64 D_800EE580; void func_800608E0(void *arg0, s16 arg1, ? arg2, s8 arg3) { @@ -4487,7 +4486,7 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800608E0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800608E0(s16, s8, s32); // extern +void func_800608E0(s16, s8, s32); // extern void func_80060B14(s32 arg0, s16 arg1, s32 arg2, s8 arg3, s8 arg4) { s16 temp_v0; @@ -4511,9 +4510,9 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80060B14.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8005D794(void *, void *, f32, f32, f32, s32, s32); // extern -? func_8005D7D8(void *, ?, ?); // extern -? func_8005D800(void *, ?, ?); // extern +void func_8005D794(void *, void *, f32, f32, f32, s32, s32); // extern +void func_8005D7D8(void *, ?, ?); // extern +void func_8005D800(void *, ?, ?); // extern f32 sins(s32); // extern f32 coss(s32); // extern extern f64 D_800EE588; @@ -4615,7 +4614,7 @@ void func_80061130(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80061130(s16, s8, s32); // extern +void func_80061130(s16, s8, s32); // extern void func_80061224(void *arg0, s16 arg1, s32 arg2, s8 arg3, s8 arg4) { s16 temp_a1; @@ -4784,9 +4783,9 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800615AC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8005D794(void *, s32, f32, f32, f32, s32, s32); // extern -? func_8005D7D8(s32, ?, ?); // extern -? func_8005D800(s32, ?, ?); // extern +void func_8005D794(void *, s32, f32, f32, f32, s32, s32); // extern +void func_8005D7D8(s32, ?, ?); // extern +void func_8005D800(s32, ?, ?); // extern f32 sins(s32); // extern f32 coss(s32); // extern @@ -4837,7 +4836,7 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80061754.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80061754(s16, s8, s32); // extern +void func_80061754(s16, s8, s32); // extern void func_8006199C(s32 arg0, s16 arg1, s32 arg2, s8 arg3, s8 arg4) { void *temp_v0; @@ -4856,9 +4855,9 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006199C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8005D794(void *, void *, f32, f32, f32, s32, s32); // extern -? func_8005D7D8(void *, ?, ?); // extern -? func_8005D800(void *, ?, ?); // extern +void func_8005D794(void *, void *, f32, f32, f32, s32, s32); // extern +void func_8005D7D8(void *, ?, ?); // extern +void func_8005D800(void *, ?, ?); // extern f32 sins(s32); // extern f32 coss(s32); // extern @@ -4960,9 +4959,9 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80061D4C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8005D794(void *, void *, f32, f32, f32, s32, s32); // extern -? func_8005D7D8(void *, ?, ?); // extern -? func_8005D800(void *, ?, ?); // extern +void func_8005D794(void *, void *, f32, f32, f32, s32, s32); // extern +void func_8005D7D8(void *, ?, ?); // extern +void func_8005D800(void *, ?, ?); // extern f32 sins(s32); // extern f32 coss(s32); // extern @@ -5110,8 +5109,8 @@ void func_80062484(Player* player, UnkPlayerStruct258* arg1, s32 arg2) { #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_8005DAD8(void *, s16, ?, ?); /* extern */ -? func_80062484(void *, void *, s32); /* extern */ +void func_8005DAD8(void *, s16, ?, ?); /* extern */ +void func_80062484(void *, void *, s32); /* extern */ s16 gCurrentCourseId; /* unable to generate initializer */ void func_800624D8(void *arg0, s16 arg1, s8 arg2, s8 arg3) { @@ -5391,7 +5390,7 @@ void func_80062B18(f32 *arg0, f32 *arg1, f32 *arg2, f32 arg3, f32 arg4, f32 arg5 #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80062B18(f32 *, f32 *, f32 *, ?, f32, f32, s32, s32); // extern +void func_80062B18(f32 *, f32 *, f32 *, ?, f32, f32, s32, s32); // extern extern ? D_800E4898; extern f64 D_800EE610; extern f64 D_800EE618; @@ -5732,7 +5731,7 @@ void func_80063D58(Player* player, s16 arg1, UNUSED s8 arg2, UNUSED s8 arg3) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80062B18(f32 *, f32 *, f32 *, ?, f32, f32, s32, s32); // extern +void func_80062B18(f32 *, f32 *, f32 *, ?, f32, f32, s32, s32); // extern // Separated from asm in code_80057C60/func_80063D58.s UNUSED void func_80063FBC(void *arg0, s16 arg1, ? arg2, ? arg3) { @@ -6142,9 +6141,9 @@ void func_800651F4(Player* player, UNUSED s16 arg1, UNUSED s8 arg2, s8 arg3) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80021E10(? *, s32, s32); // extern -? func_80021F84(? *, s32); // extern -? func_80022180(void *, ? *); // extern +void func_80021E10(? *, s32, s32); // extern +void func_80021F84(? *, s32); // extern +void func_80022180(void *, ? *); // extern extern s16 D_80164AF0; extern void *gDisplayListHead; @@ -6166,17 +6165,17 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800652D4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B72C(s16, s16, s16, s16, s32, s32, s32); // extern -? func_800652D4(f32 *, s16 *, f32, s8); // extern +void func_8004B72C(s16, s16, s16, s16, s32, s32, s32); // extern +void func_800652D4(f32 *, s16 *, f32, s8); // extern extern ? D_06000224; -extern ? D_0D008DB8; -extern ? D_0D008E48; -extern ? D_0D02BC58; +extern Gfx D_0D008DB8; +extern Gfx D_0D008E48; +extern s8 D_0D02BC58; extern ? D_800E48B8; extern ? D_800E48C0; extern f64 D_800EE7C0; extern s16 D_80164AF0; -extern ? D_8018D930; +extern s32 D_8018D930; extern f32 gCourseTimer; extern ? **gDisplayListHead; @@ -6357,10 +6356,10 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006538C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B35C(s16, s16, s16, s16); // extern -? func_800652D4(f32 *, s16 *, f32, s8); // extern -extern ? D_0D008DB8; -extern ? D_0D008E48; +void func_8004B35C(s16, s16, s16, s16); // extern +void func_800652D4(f32 *, s16 *, f32, s8); // extern +extern Gfx D_0D008DB8; +extern Gfx D_0D008E48; extern s16 D_80164AF0; extern s32 D_8018D48C; extern void *gDisplayListHead; @@ -6452,11 +6451,11 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800658A0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B72C(s16, s16, s16, s16, s32, s32, s32); // extern -? func_800652D4(f32 *, s16 *, f32, s8); // extern -extern ? D_0D008DB8; -extern ? D_0D008DF8; -extern ? D_0D008E48; +void func_8004B72C(s16, s16, s16, s16, s32, s32, s32); // extern +void func_800652D4(f32 *, s16 *, f32, s8); // extern +extern Gfx D_0D008DB8; +extern Gfx D_0D008DF8; +extern Gfx D_0D008E48; extern ? D_800E4770; extern ? D_800E48C8; extern s16 D_80164AF0; @@ -6627,14 +6626,14 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80065AB0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B35C(s16, s16, s16, ?); // extern -? func_8004B72C(s16, s16, s16, s16, s32, s32, s32); // extern -? func_800652D4(f32 *, s16 *, f32); // extern +void func_8004B35C(s16, s16, s16, ?); // extern +void func_8004B72C(s16, s16, s16, s16, s32, s32, s32); // extern +void func_800652D4(f32 *, s16 *, f32); // extern extern ? D_05FF8DB8; -extern ? D_0D008C90; -extern ? D_0D008DA0; -extern ? D_0D008DB8; -extern ? D_0D008E48; +extern Gfx D_0D008C90; +extern Gfx D_0D008DA0; +extern Gfx D_0D008DB8; +extern Gfx D_0D008E48; extern ? D_800E47DC; extern ? D_800E480C; extern ? D_800E8C00; @@ -6860,10 +6859,10 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80065F0C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B35C(s16, s16, s16, s16); // extern -? func_800652D4(f32 *, s16 *, f32, s8); // extern -extern ? D_0D008DB8; -extern ? D_0D008E48; +void func_8004B35C(s16, s16, s16, s16); // extern +void func_800652D4(f32 *, s16 *, f32, s8); // extern +extern Gfx D_0D008DB8; +extern Gfx D_0D008E48; extern s16 D_80164AF0; extern s32 D_8018D48C; extern void *gDisplayListHead; @@ -7061,10 +7060,10 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80066714.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B35C(s16, s16, s16, s16); // extern -? func_800652D4(f32 *, s16 *, f32, s8); // extern -extern ? D_0D008DB8; -extern ? D_0D008E48; +void func_8004B35C(s16, s16, s16, s16); // extern +void func_800652D4(f32 *, s16 *, f32, s8); // extern +extern Gfx D_0D008DB8; +extern Gfx D_0D008E48; extern s16 D_80164AF0; extern s32 D_8018D48C; extern void *gDisplayListHead; @@ -7156,14 +7155,14 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80066998.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800652D4(f32 *, s16 *, f32); // extern +void func_800652D4(f32 *, s16 *, f32); // extern f32 sins(u16); // extern f32 coss(u16); // extern -extern ? D_0D008C78; -extern ? D_0D008DA0; -extern ? D_0D008DB8; +extern Gfx D_0D008C78; +extern Gfx D_0D008DA0; +extern Gfx D_0D008DB8; extern ? D_800E8900; -extern ? D_80164714; +extern u16 D_80164714; extern s16 D_80164AF0; extern s32 D_8018D4C4; extern s32 D_8018D4C8; @@ -7426,12 +7425,12 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80066BAC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B35C(s16, s16, s16, s16); // extern -? func_800652D4(f32 *, s16 *, f32, s8); // extern +void func_8004B35C(s16, s16, s16, s16); // extern +void func_800652D4(f32 *, s16 *, f32, s8); // extern extern ? D_06000224; -extern ? D_0D008DB8; -extern ? D_0D008E48; -extern ? D_0D008E70; +extern Gfx D_0D008DB8; +extern Gfx D_0D008E48; +extern Gfx D_0D008E70; extern s16 D_80164AF0; extern s32 D_8018D48C; extern ? **gDisplayListHead; @@ -7577,13 +7576,13 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80067280.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B72C(?, ?, ?, ?, s32, s32, s32); // extern -? func_800652D4(f32 *, s16 *, f32); // extern +void func_8004B72C(?, ?, ?, ?, s32, s32, s32); // extern +void func_800652D4(f32 *, s16 *, f32); // extern extern ? D_05FF8DB8; -extern ? D_0D008DB8; -extern ? D_0D008E48; -extern ? D_0D008E70; -extern ? D_0D02AC58; +extern Gfx D_0D008DB8; +extern Gfx D_0D008E48; +extern Gfx D_0D008E70; +extern s8 D_0D02AC58; extern s16 D_80164AF0; extern void *gDisplayListHead; @@ -7717,10 +7716,10 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80067604.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800652D4(f32, f32 *, s16 *, f32, void *); // extern -extern ? D_0D008C78; -extern ? D_0D008C90; -extern ? D_0D008DA0; +void func_800652D4(f32, f32 *, s16 *, f32, void *); // extern +extern Gfx D_0D008C78; +extern Gfx D_0D008C90; +extern Gfx D_0D008DA0; extern ? D_800E52D0; extern ? D_800E8800; extern ? D_800E8840; @@ -7895,12 +7894,12 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80067964.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B414(s16, s16, s16, ?); // extern -? func_800652D4(f32 *, s16 *, f32); // extern +void func_8004B414(s16, s16, s16, ?); // extern +void func_800652D4(f32 *, s16 *, f32); // extern f32 sins(s32, s8, s8); // extern f32 coss(s32); // extern -extern ? D_0D008DB8; -extern ? D_0D008E20; +extern Gfx D_0D008DB8; +extern Gfx D_0D008E20; extern ? D_800E48D4; extern s16 D_80164AF0; extern void *gDisplayListHead; @@ -7989,12 +7988,12 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80067D3C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B414(s16, s16, s16, ?); // extern -? func_800652D4(f32 *, s16 *, f32); // extern +void func_8004B414(s16, s16, s16, ?); // extern +void func_800652D4(f32 *, s16 *, f32); // extern f32 sins(s32, s8, s8); // extern f32 coss(s32); // extern -extern ? D_0D008DB8; -extern ? D_0D008E20; +extern Gfx D_0D008DB8; +extern Gfx D_0D008E20; extern ? D_800E48F4; extern f64 D_800EE7C8; extern s16 D_80164AF0; @@ -8084,12 +8083,12 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006801C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800652D4(f32 *, s16 *, f32); // extern +void func_800652D4(f32 *, s16 *, f32); // extern f32 sins(u16); // extern f32 coss(u16); // extern -extern ? D_0D008C78; -extern ? D_0D008C90; -extern ? D_0D008DA0; +extern Gfx D_0D008C78; +extern Gfx D_0D008C90; +extern Gfx D_0D008DA0; extern ? D_800E52D0; extern ? D_800E8880; extern ? D_800E88C0; @@ -8265,12 +8264,12 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80068310.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800652D4(f32 *, s16 *, f32); // extern +void func_800652D4(f32 *, s16 *, f32); // extern f32 sins(u16); // extern f32 coss(u16); // extern -extern ? D_0D008C78; -extern ? D_0D008DA0; -extern ? D_0D008DB8; +extern Gfx D_0D008C78; +extern Gfx D_0D008DA0; +extern Gfx D_0D008DB8; extern ? D_800E8A00; extern ? D_800E8A40; extern s16 D_80164AF0; @@ -8420,12 +8419,12 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80068724.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B35C(?, ?, ?, ?); // extern -? func_800652D4(f32 *, s16 *, f32); // extern +void func_8004B35C(?, ?, ?, ?); // extern +void func_800652D4(f32 *, s16 *, f32); // extern f32 sins(u16); // extern f32 coss(u16); // extern -extern ? D_0D008D58; -extern ? D_0D008DA0; +extern Gfx D_0D008D58; +extern Gfx D_0D008DA0; extern ? D_800E8B40; extern s16 D_80164AF0; extern s32 D_8018D4A0; @@ -8533,12 +8532,12 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80068AA4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800652D4(f32 *, s16 *, f32); // extern +void func_800652D4(f32 *, s16 *, f32); // extern f32 sins(u16); // extern f32 coss(u16); // extern -extern ? D_0D008C78; -extern ? D_0D008C90; -extern ? D_0D008DA0; +extern Gfx D_0D008C78; +extern Gfx D_0D008C90; +extern Gfx D_0D008DA0; extern ? D_800E52D0; extern ? D_800E8B80; extern ? D_800E8BC0; @@ -8822,10 +8821,10 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800691B8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B72C(s16, s16, s16, s16, s32, s32, s32); // extern -? func_800652D4(f32 *, s16 *, f32, s8); // extern -extern ? D_0D008DB8; -extern ? D_0D008E48; +void func_8004B72C(s16, s16, s16, s16, s32, s32, s32); // extern +void func_800652D4(f32 *, s16 *, f32, s8); // extern +extern Gfx D_0D008DB8; +extern Gfx D_0D008E48; extern ? D_800E47DC; extern ? D_800E480C; extern s16 D_80164AF0; @@ -8927,11 +8926,11 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80069444.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B35C(?, ?, ?, s16); // extern -? func_800652D4(f32 *, s16 *, f32, s8); // extern -extern ? D_0D008D58; -extern ? D_0D008DA0; -extern ? D_800E87C0; +void func_8004B35C(?, ?, ?, s16); // extern +void func_800652D4(f32 *, s16 *, f32, s8); // extern +extern Gfx D_0D008D58; +extern Gfx D_0D008DA0; +extern Gfx D_800E87C0; extern s16 D_80164AF0; extern s32 D_8018D488; extern void *gDisplayListHead; @@ -9034,11 +9033,11 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_800696CC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B35C(?, ?, ?, s16); // extern -? func_800652D4(f32 *, s16 *, f32, s8); // extern -extern ? D_0D008D58; -extern ? D_0D008DA0; -extern ? D_800E87C0; +void func_8004B35C(?, ?, ?, s16); // extern +void func_800652D4(f32 *, s16 *, f32, s8); // extern +extern Gfx D_0D008D58; +extern Gfx D_0D008DA0; +extern Gfx D_800E87C0; extern s16 D_80164AF0; extern s32 D_8018D488; extern void *gDisplayListHead; @@ -9141,10 +9140,10 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80069938.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B35C(s16, s16, s16, s16); // extern -? func_800652D4(f32 *, s16 *, f32, s8); // extern -extern ? D_0D008DB8; -extern ? D_0D008E48; +void func_8004B35C(s16, s16, s16, s16); // extern +void func_800652D4(f32 *, s16 *, f32, s8); // extern +extern Gfx D_0D008DB8; +extern Gfx D_0D008E48; extern s16 D_80164AF0; extern s32 D_8018D48C; extern void *gDisplayListHead; @@ -9236,10 +9235,10 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80069BA8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B35C(?, ?, ?, ?); // extern -? func_800652D4(f32 *, s16 *, f32); // extern -extern ? D_0D008D58; -extern ? D_0D008DA0; +void func_8004B35C(?, ?, ?, ?); // extern +void func_800652D4(f32 *, s16 *, f32); // extern +extern Gfx D_0D008D58; +extern Gfx D_0D008DA0; extern ? D_800E8740; extern s16 D_80164AF0; extern s32 D_8018D49C; @@ -9339,11 +9338,11 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80069DB8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B35C(?, ?, ?, ?); // extern -? func_800652D4(f32 *, s16 *, f32); // extern -extern ? D_0D008B78; -extern ? D_0D008D58; -extern ? D_0D008DA0; +void func_8004B35C(?, ?, ?, ?); // extern +void func_800652D4(f32 *, s16 *, f32); // extern +extern Vtx D_0D008B78; +extern Gfx D_0D008D58; +extern Gfx D_0D008DA0; extern s16 D_80164AF0; extern s32 D_8018D49C; extern void *gDisplayListHead; @@ -9442,10 +9441,10 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006A01C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8004B414(s16, s16, s16, ?); // extern -? func_800652D4(f32 *, s16 *, f32, s8); // extern -extern ? D_0D008D58; -extern ? D_0D008DA0; +void func_8004B414(s16, s16, s16, ?); // extern +void func_800652D4(f32 *, s16 *, f32, s8); // extern +extern Gfx D_0D008D58; +extern Gfx D_0D008DA0; extern ? D_800E47A0; extern ? D_800E8780; extern s16 D_80164AF0; @@ -9551,13 +9550,13 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006A280.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80062B18(?, f32, f32 *, f32 *, f32 *, ?, f32, f32, s32, s32); // extern +void func_80062B18(?, f32, f32 *, f32 *, f32 *, ?, f32, f32, s32, s32); // extern extern f32 D_800EE7D0; extern f64 D_800EE7D8; extern ? D_8018D4D0; extern ? D_8018D530; extern ? D_8018D590; -extern ? gPlayerBalloonStatus; +extern u16 gPlayerBalloonStatus; extern ? D_8018D620; extern ? D_8018D650; extern ? D_8018D6B0; @@ -9611,9 +9610,9 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006A50C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? move_s16_towards(void *, s16, ?); // extern -? func_80062B18(f32 *, f32 *, f32 *, s32, f32, f32, s32, s32); // extern -? func_8006B974(void *, s8, s8); // extern +void move_s16_towards(void *, s16, ?); // extern +void func_80062B18(f32 *, f32 *, f32 *, s32, f32, f32, s32, s32); // extern +void func_8006B974(void *, s8, s8); // extern extern ? D_800E4914; extern f64 D_800EE7E0; extern f64 D_800EE7E8; @@ -9630,7 +9629,7 @@ extern f64 D_800EE838; extern ? D_8018D4D0; extern ? D_8018D530; extern ? D_8018D590; -extern ? gPlayerBalloonStatus; +extern u16 gPlayerBalloonStatus; extern ? D_8018D620; extern ? D_8018D650; extern ? D_8018D6B0; @@ -9843,14 +9842,14 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006A7C0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80021E10(? *, f32 *, s16 *); // extern -? func_80021F84(? *, f32); // extern -? func_80022180(void *, ? *); // extern -? func_8004B614(s16, s16, s16, s16, s32, s32, s32); // extern +void func_80021E10(? *, f32 *, s16 *); // extern +void func_80021F84(? *, f32); // extern +void func_80022180(void *, ? *); // extern +void func_8004B614(s16, s16, s16, s16, s32, s32, s32); // extern f32 sins(u16); // extern f32 coss(s32); // extern -extern ? D_0D008C78; -extern ? D_0D008DB8; +extern Gfx D_0D008C78; +extern Gfx D_0D008DB8; extern ? D_800E4934; extern ? D_800E4954; extern ? D_800E5250; @@ -9861,7 +9860,7 @@ extern f64 D_800EE848; extern f32 D_800EE850; extern f64 D_800EE858; extern f32 D_800EE860; -extern ? cameras; +extern Camera cameras; extern s16 D_80164AF0; extern s32 D_8018D4BC; extern s32 D_8018D4C0; @@ -9982,7 +9981,7 @@ void func_8006AFD0(void *arg0, s8 arg1, s16 arg2, s8 arg3) { temp_v0_2 = (arg3 * 0xB8) + &cameras; temp_f20 = arg0->unk14 - temp_v0_2->unk0; temp_f0 = arg0->unk1C - temp_v0_2->unk8; - if (gActiveScreenMode != 3) { + if (gActiveScreenMode != SCREEN_MODE_3P_4P_SPLITSCREEN) { sp11C = temp_t1; phi_f20 = sqrtf((temp_f20 * temp_f20) + (temp_f0 * temp_f0)) / 300.0f; } else { @@ -10146,8 +10145,8 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006AFD0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8006A50C(Player *, Player *, s8, s32, s32, s32); // extern -extern ? gPlayerBalloonCount; +void func_8006A50C(Player *, Player *, s8, s32, s32, s32); // extern +extern s16 gPlayerBalloonCount; void func_8006B7E4(Player *player, s32 arg1) { func_8006A50C(NULL, NULL, arg1, 0, 0); @@ -10167,10 +10166,10 @@ void func_8006B87C(UNUSED Player *player, s8 playerIndex) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8008FD4C(s32, s8, s8); // extern -? func_800C9060(s32, ?, s8, s16); // extern -extern ? gPlayerBalloonStatus; -extern ? gPlayerBalloonCount; +void func_8008FD4C(s32, s8, s8); // extern +void func_800C9060(s32, ?, s8, s16); // extern +extern u16 gPlayerBalloonStatus; +extern s16 gPlayerBalloonCount; void func_8006B8B4(s32 arg0, s8 playerIndex) { s16 *sp1C; @@ -10238,12 +10237,12 @@ void func_8006BA94(Player* player, s8 playerIndex, s8 arg2) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80021E10(? *, f32 *, s16 *, s16); // extern -? func_80021F84(? *, s32); // extern -? func_80022180(void *, ? *); // extern -? func_8004B614(s16, s16, s16, s16, s32, s32, s32); // extern -extern ? D_0D008C78; -extern ? D_0D008DB8; +void func_80021E10(? *, f32 *, s16 *, s16); // extern +void func_80021F84(? *, s32); // extern +void func_80022180(void *, ? *); // extern +void func_8004B614(s16, s16, s16, s16, s32, s32, s32); // extern +extern Gfx D_0D008C78; +extern Gfx D_0D008DB8; extern ? D_800E4974; extern ? D_800E4994; extern ? D_800E5250; @@ -10698,20 +10697,20 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006C4D4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_8005DA30(s16, s32, s8, s32); /* extern */ -? func_8005DAF4(s16, s32, s8, s32); /* extern */ -? func_8005EA94(s16, s32, s8, s32); /* extern */ -? func_8005ED48(s16, s32, s8, s32); /* extern */ -? func_8005F90C(s16, s32, s8, s32); /* extern */ -? func_80060BCC(s16, s32, s8, s32); /* extern */ -? func_80062F98(s16, s8, s8); /* extern */ -? func_80063408(s16, s8, s8); /* extern */ -? func_800635D4(s16, s8, s8); /* extern */ -? func_800639DC(s16, s8, s8); /* extern */ -? func_80063BD4(s16, s8, s8); /* extern */ -? func_80063D58(s16, s8, s8); /* extern */ -? func_800643A8(s16, s8, s8); /* extern */ -extern ? D_801652A0; +void func_8005DA30(s16, s32, s8, s32); /* extern */ +void func_8005DAF4(s16, s32, s8, s32); /* extern */ +void func_8005EA94(s16, s32, s8, s32); /* extern */ +void func_8005ED48(s16, s32, s8, s32); /* extern */ +void func_8005F90C(s16, s32, s8, s32); /* extern */ +void func_80060BCC(s16, s32, s8, s32); /* extern */ +void func_80062F98(s16, s8, s8); /* extern */ +void func_80063408(s16, s8, s8); /* extern */ +void func_800635D4(s16, s8, s8); /* extern */ +void func_800639DC(s16, s8, s8); /* extern */ +void func_80063BD4(s16, s8, s8); /* extern */ +void func_80063D58(s16, s8, s8); /* extern */ +void func_800643A8(s16, s8, s8); /* extern */ +extern f32 D_801652A0; void func_8006C6AC(void *arg0, s16 arg1, s8 arg2, s8 arg3) { s32 sp28; @@ -10789,24 +10788,24 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006C6AC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_800612F8(s16, s32, s8, s32); /* extern */ -? func_80061430(s16, s32, s8, s32); /* extern */ -? func_800615AC(s16, s32, s8, s32); /* extern */ -? func_8006199C(s16, s32, s8, s32); /* extern */ -? func_80061A34(s16, s32, s8, s32); /* extern */ -? func_80061D4C(s16, s32, s8, s32); /* extern */ -? func_80061EF4(s16, s32, s8, s32); /* extern */ -? func_800621BC(s16, s32, s8, s32); /* extern */ -? func_800624D8(s16, s32, s8, s32); /* extern */ -? func_800644E8(s16, s8, s8); /* extern */ -? func_80064664(s16, s8, s8); /* extern */ -? func_800647C8(s16, s8, s8); /* extern */ -? func_800648E4(s16, s8, s8); /* extern */ -? func_80064988(s16, s8, s8); /* extern */ -? func_800649F4(s16, s8, s8); /* extern */ -? func_80064B30(s16, s8, s8); /* extern */ -? func_80064C74(s16, s8, s8); /* extern */ -extern ? D_8018D930; +void func_800612F8(s16, s32, s8, s32); /* extern */ +void func_80061430(s16, s32, s8, s32); /* extern */ +void func_800615AC(s16, s32, s8, s32); /* extern */ +void func_8006199C(s16, s32, s8, s32); /* extern */ +void func_80061A34(s16, s32, s8, s32); /* extern */ +void func_80061D4C(s16, s32, s8, s32); /* extern */ +void func_80061EF4(s16, s32, s8, s32); /* extern */ +void func_800621BC(s16, s32, s8, s32); /* extern */ +void func_800624D8(s16, s32, s8, s32); /* extern */ +void func_800644E8(s16, s8, s8); /* extern */ +void func_80064664(s16, s8, s8); /* extern */ +void func_800647C8(s16, s8, s8); /* extern */ +void func_800648E4(s16, s8, s8); /* extern */ +void func_80064988(s16, s8, s8); /* extern */ +void func_800649F4(s16, s8, s8); /* extern */ +void func_80064B30(s16, s8, s8); /* extern */ +void func_80064C74(s16, s8, s8); /* extern */ +extern s32 D_8018D930; void func_8006C9B8(void *arg0, s16 arg1, s8 arg2, s8 arg3) { s32 sp28; @@ -10917,16 +10916,16 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006C9B8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_80060504(s16, s32, s8, s32); /* extern */ -? func_80060B14(s16, s32, s8, s32); /* extern */ -? func_80060F50(s16, s32, s8, s32); /* extern */ -? func_80061094(s16, s32, s8, s32); /* extern */ -? func_80061224(s16, s32, s8, s32); /* extern */ -? func_80062C74(s16, s8, s8); /* extern */ -? func_800630C0(s16, s8, s8); /* extern */ -? func_800631A8(s16, s8, s8); /* extern */ -? func_80063268(s16, s8, s8); /* extern */ -? func_80064184(s16, s8, s8); /* extern */ +void func_80060504(s16, s32, s8, s32); /* extern */ +void func_80060B14(s16, s32, s8, s32); /* extern */ +void func_80060F50(s16, s32, s8, s32); /* extern */ +void func_80061094(s16, s32, s8, s32); /* extern */ +void func_80061224(s16, s32, s8, s32); /* extern */ +void func_80062C74(s16, s8, s8); /* extern */ +void func_800630C0(s16, s8, s8); /* extern */ +void func_800631A8(s16, s8, s8); /* extern */ +void func_80063268(s16, s8, s8); /* extern */ +void func_80064184(s16, s8, s8); /* extern */ void func_8006CEC0(void *arg0, s16 arg1, s8 arg2, s8 arg3) { s32 sp20; @@ -10990,8 +10989,8 @@ void func_8006CEC0(void *arg0, s16 arg1, s8 arg2, s8 arg3) { } block_22: temp_v0_4 = gActiveScreenMode; - if (temp_v0_4 != 0) { - if ((temp_v0_4 != 1) && (temp_v0_4 != 2) && (temp_v0_4 != 3)) { + if (temp_v0_4 != SCREEN_MODE_1P) { + if ((temp_v0_4 != SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL) && (temp_v0_4 != SCREEN_MODE_2P_SPLITSCREEN_VERTICAL) && (temp_v0_4 != SCREEN_MODE_3P_4P_SPLITSCREEN)) { return; } if ((temp_t1_2 != 0) && ((temp_v1 & 0x4000000) != 0x4000000) && ((temp_v1 & 0x400) != 0x400) && ((temp_v1 & 0x1000000) != 0x1000000)) { @@ -11016,18 +11015,18 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006CEC0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_800628C0(void *, s8, s8, ?); /* extern */ -? func_80062914(void *, s8, s8, ?); /* extern */ -? func_80062968(void *, s8, s8, ?); /* extern */ -? func_800629BC(void *, s8, s8, ?); /* extern */ -? func_80062A18(void *, s8, s8, ?); /* extern */ -? func_80062AA8(void *, s8, s8, ?); /* extern */ -? func_80064DEC(void *, s8, s8, ?); /* extern */ -? func_80064EA4(void *, s8, s8, ?); /* extern */ -? func_80064F88(void *, s8, s8, ?); /* extern */ -? func_80065030(void *, s8, s8, ?); /* extern */ -? func_800650FC(void *, s8, s8, ?); /* extern */ -? func_800651F4(void *, s8, s8, ?); /* extern */ +void func_800628C0(void *, s8, s8, ?); /* extern */ +void func_80062914(void *, s8, s8, ?); /* extern */ +void func_80062968(void *, s8, s8, ?); /* extern */ +void func_800629BC(void *, s8, s8, ?); /* extern */ +void func_80062A18(void *, s8, s8, ?); /* extern */ +void func_80062AA8(void *, s8, s8, ?); /* extern */ +void func_80064DEC(void *, s8, s8, ?); /* extern */ +void func_80064EA4(void *, s8, s8, ?); /* extern */ +void func_80064F88(void *, s8, s8, ?); /* extern */ +void func_80065030(void *, s8, s8, ?); /* extern */ +void func_800650FC(void *, s8, s8, ?); /* extern */ +void func_800651F4(void *, s8, s8, ?); /* extern */ void func_8006D194(void *arg0, s8 arg1, s8 arg2) { u16 temp_t9; @@ -11095,21 +11094,21 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8006D194.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_8006538C(void *, s8, s16, s8); /* extern */ -? func_80065AB0(void *, s8, s16, s8); /* extern */ -? func_80065F0C(void *, s8, s16, s8); /* extern */ -? func_800664E0(void *, s8, s16, s8); /* extern */ -? func_80066BAC(void *, s8, s16, s8); /* extern */ -? func_80067280(void *, s8, s16, s8); /* extern */ -? func_80067604(void *, s8, s16, s8); /* extern */ -? func_800691B8(void *, s8, s16, s8); /* extern */ -? func_80069444(void *, s8, s16, s8); /* extern */ -? func_800696CC(void *, s8, s16, s8, f32); /* extern */ -? func_80069938(void *, s8, s16, s8); /* extern */ -? func_80069BA8(void *, s8, s16, s8); /* extern */ -? func_80069DB8(void *, s8, s16, s8); /* extern */ -? func_8006A01C(void *, s8, s16, s8); /* extern */ -? func_8006BA94(void *, s8, s8); /* extern */ +void func_8006538C(void *, s8, s16, s8); /* extern */ +void func_80065AB0(void *, s8, s16, s8); /* extern */ +void func_80065F0C(void *, s8, s16, s8); /* extern */ +void func_800664E0(void *, s8, s16, s8); /* extern */ +void func_80066BAC(void *, s8, s16, s8); /* extern */ +void func_80067280(void *, s8, s16, s8); /* extern */ +void func_80067604(void *, s8, s16, s8); /* extern */ +void func_800691B8(void *, s8, s16, s8); /* extern */ +void func_80069444(void *, s8, s16, s8); /* extern */ +void func_800696CC(void *, s8, s16, s8, f32); /* extern */ +void func_80069938(void *, s8, s16, s8); /* extern */ +void func_80069BA8(void *, s8, s16, s8); /* extern */ +void func_80069DB8(void *, s8, s16, s8); /* extern */ +void func_8006A01C(void *, s8, s16, s8); /* extern */ +void func_8006BA94(void *, s8, s8); /* extern */ void func_8006D474(void *arg0, s8 arg1, s8 arg2) { s32 sp44; @@ -11133,14 +11132,14 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) { if (temp_v0_2 != 1) { if (temp_v0_2 != 6) { - } else if (gActiveScreenMode == 3) { + } else if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { if (arg2 == arg1) { func_80066BAC(arg0, arg1, phi_s2, arg2); } } else if (arg2 == arg1) { func_80066BAC(arg0, arg1, phi_s2, arg2); } - } else if (gActiveScreenMode == 3) { + } else if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { if (arg2 == arg1) { func_8006538C(arg0, arg1, phi_s2, arg2); } @@ -11151,56 +11150,56 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) { switch (temp_t8_2) { /* switch 1 */ case 1: /* switch 1 */ case 9: /* switch 1 */ - if (gActiveScreenMode == 0) { + if (gActiveScreenMode == SCREEN_MODE_1P) { func_800691B8(arg0, arg1, phi_s2, arg2); } else if (arg2 == arg1) { func_800691B8(arg0, arg1, phi_s2, arg2); } break; case 2: /* switch 1 */ - if (gActiveScreenMode == 0) { + if (gActiveScreenMode == SCREEN_MODE_1P) { func_800696CC(arg0, arg1, phi_s2, arg2, temp_s5->unkAD4); } else if (arg2 == arg1) { func_800696CC(arg0, arg1, phi_s2, arg2, temp_s5->unkAD4); } break; case 3: /* switch 1 */ - if (gActiveScreenMode == 0) { + if (gActiveScreenMode == SCREEN_MODE_1P) { func_80067280(arg0, arg1, phi_s2, arg2); } else if (arg2 == arg1) { func_80067280(arg0, arg1, phi_s2, arg2); } break; case 4: /* switch 1 */ - if (gActiveScreenMode == 0) { + if (gActiveScreenMode == SCREEN_MODE_1P) { func_80069444(arg0, arg1, phi_s2, arg2); } else if (arg2 == arg1) { func_80069444(arg0, arg1, phi_s2, arg2); } break; case 5: /* switch 1 */ - if (gActiveScreenMode == 0) { + if (gActiveScreenMode == SCREEN_MODE_1P) { func_80069938(arg0, arg1, phi_s2, arg2); } else if (arg2 == arg1) { func_80069938(arg0, arg1, phi_s2, arg2); } break; case 6: /* switch 1 */ - if (gActiveScreenMode == 0) { + if (gActiveScreenMode == SCREEN_MODE_1P) { func_80069BA8(arg0, arg1, phi_s2, arg2); } else if (arg2 == arg1) { func_80069BA8(arg0, arg1, phi_s2, arg2); } break; case 7: /* switch 1 */ - if (gActiveScreenMode == 0) { + if (gActiveScreenMode == SCREEN_MODE_1P) { func_80069DB8(arg0, arg1, phi_s2, arg2); } else if (arg2 == arg1) { func_80069DB8(arg0, arg1, phi_s2, arg2); } break; case 8: /* switch 1 */ - if (gActiveScreenMode == 0) { + if (gActiveScreenMode == SCREEN_MODE_1P) { func_80067604(arg0, arg1, phi_s2, arg2); } else if (arg2 == arg1) { func_80067604(arg0, arg1, phi_s2, arg2); @@ -11210,7 +11209,7 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) { temp_t6 = temp_s5->unk53A; switch (temp_t6) { /* switch 2 */ case 1: /* switch 2 */ - if (gActiveScreenMode == 3) { + if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { if (arg2 == arg1) { func_80065AB0(arg0, arg1, phi_s2, arg2); } @@ -11222,7 +11221,7 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) { case 3: /* switch 2 */ case 4: /* switch 2 */ case 5: /* switch 2 */ - if (gActiveScreenMode == 3) { + if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { if (arg2 == arg1) { func_80065F0C(arg0, arg1, phi_s2, arg2); } @@ -11231,7 +11230,7 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) { } break; case 9: /* switch 2 */ - if (gActiveScreenMode == 3) { + if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { if (arg2 == arg1) { func_800664E0(arg0, arg1, phi_s2, arg2); } @@ -11240,7 +11239,7 @@ void func_8006D474(void *arg0, s8 arg1, s8 arg2) { } break; case 11: /* switch 2 */ - if (gActiveScreenMode == 3) { + if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { if (arg2 == arg1) { func_8006A01C(arg0, arg1, phi_s2, arg2); } @@ -11288,7 +11287,7 @@ void func_8006DD3C(Player* arg0, s8 arg1, s8 arg2) { if (temp_v0 == 5) { func_8006A280(arg0, arg1, temp_s0, arg2); } - } else if (gActiveScreenMode == 3) { + } else if (gActiveScreenMode == SCREEN_MODE_3P_4P_SPLITSCREEN) { if (arg2 == arg1) { func_80066998(arg0, arg1, temp_s0, arg2); } diff --git a/src/code_8006E9C0.c b/src/code_8006E9C0.c index b83cad1f1..a6ea44353 100644 --- a/src/code_8006E9C0.c +++ b/src/code_8006E9C0.c @@ -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; diff --git a/src/code_80071F00.c b/src/code_80071F00.c index 3c42266be..1c3e4b912 100644 --- a/src/code_80071F00.c +++ b/src/code_80071F00.c @@ -36,7 +36,7 @@ s32 find_unused_obj_index(s32* arg0) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -//? func_80072428(s32, s32 *); // extern +//void func_80072428(s32, s32 *); // extern extern s8 D_80165CE2[]; void func_80071F6C(s32 arg0, s32 arg1) { @@ -1290,7 +1290,7 @@ s32 func_80074790(s32 arg0, s32 arg1) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80074574(s32, s32, u8, u8); /* extern */ +void func_80074574(s32, s32, u8, u8); /* extern */ void func_800747F0(s32 objectIndex, s32 arg1) { s32 sp24; @@ -1341,7 +1341,7 @@ struct _struct_D_800E6F48_0x3 { /* 0x2 */ u8 unk2; /* inferred */ }; /* size = 0x3 */ -? func_8008B80C(s32, ?, ?, ?); /* extern */ +void func_8008B80C(s32, ?, ?, ?); /* extern */ extern s16 D_80165718; extern s16 D_80165720; extern s16 D_80165728; @@ -1588,7 +1588,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800750D8.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800750D8(s32, s32, s32, s32, s32); /* extern */ +void func_800750D8(s32, s32, s32, s32, s32); /* extern */ extern s32 D_80183E38; extern s32 D_80183E4C; extern s32 D_80183E5C; @@ -1636,11 +1636,11 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80075304.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80074FD8(s32); /* extern */ +void func_80074FD8(s32); /* extern */ extern ? D_8016582C; -extern ? D_8018C1B0; -extern ? D_8018C3F0; -extern ? D_8018C630; +extern s32 D_8018C1B0; +extern s32 D_8018C3F0; +extern s32 D_8018C630; void func_8007542C(s32 arg0) { ? *sp44; @@ -2196,7 +2196,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007634C.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007634C(s32); /* extern */ +void func_8007634C(s32); /* extern */ void func_800763CC(s32 objectIndex) { struct_80165C18_entry *temp_s0; @@ -2265,8 +2265,8 @@ void func_80076538(s32 objectIndex) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800762DC(f32 *, ?); /* extern */ -? func_800C9EF4(f32 *, ?); /* extern */ +void func_800762DC(f32 *, ?); /* extern */ +void func_800C9EF4(f32 *, ?); /* extern */ void func_8007661C(void) { f32 *sp24; @@ -2419,7 +2419,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076958.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80076958(s32); /* extern */ +void func_80076958(s32); /* extern */ void func_800769D8(s32 objectIndex) { struct_80165C18_entry *temp_s0; @@ -2488,11 +2488,11 @@ void func_80076B7C(void) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007614C(); /* extern */ -? func_800763CC(s32); /* extern */ -? func_8007661C(); /* extern */ -? func_800769D8(s32); /* extern */ -? func_80076AEC(s32); /* extern */ +void func_8007614C(); /* extern */ +void func_800763CC(s32); /* extern */ +void func_8007661C(); /* extern */ +void func_800769D8(s32); /* extern */ +void func_80076AEC(s32); /* extern */ extern s32 D_8018C1B0; void func_80076B84(void) { @@ -2557,9 +2557,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076C9C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s32 func_80072044(? *, ? *, ?); // extern -? func_80076C9C(s32, s32, s16); // extern -extern ? D_80183E6C; -extern ? D_8018C870; +void func_80076C9C(s32, s32, s16); // extern +extern s32 D_80183E6C; +extern s32 D_8018C870; void func_80076D70(s32 arg0, ? arg1, s16 arg2) { s32 temp_v0; @@ -2609,7 +2609,7 @@ void func_80076ED8(s32 objectIndex) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc extern s32 D_8018C870; -extern ? D_8018C970; +extern s32 D_8018C970; void func_80076F2C(void) { s32 *var_s1; @@ -2676,9 +2676,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80076FEC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s32 func_80072044(? *, ? *, ?); // extern -? func_80076FEC(s32, s32); // extern -extern ? D_80183E6C; -extern ? D_8018C870; +void func_80076FEC(s32, s32); // extern +extern s32 D_80183E6C; +extern s32 D_8018C870; void func_800770F0(s32 arg0) { s32 temp_v0; @@ -2694,7 +2694,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800770F0.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8005C674(s8, s16 *, s16 *, s16 *); /* extern */ +void func_8005C674(s8, s16 *, s16 *, s16 *); /* extern */ void func_80077138(s32 objectIndex, Vec3f arg1, s32 arg2) { s8 sp37; @@ -2848,8 +2848,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077584.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80077450(s32); /* extern */ -? func_80077584(s32); /* extern */ +void func_80077450(s32); /* extern */ +void func_80077584(s32); /* extern */ extern s32 D_8018C630; extern ? D_8018C830; @@ -2938,9 +2938,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077700.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s32 func_80072044(? *, ? *, ?); // extern -? func_80077700(s32, s32, s32); // extern -extern ? D_80183E7C; -extern ? D_8018C970; +void func_80077700(s32, s32, s32); // extern +extern s32 D_80183E7C; +extern s32 D_8018C970; s32 func_80077A54(s32 arg0, s32 arg1) { s32 sp1C; @@ -3090,7 +3090,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077D5C.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_0D005770; +extern Vtx D_0D005770; extern s32 D_0D0293D8; void func_80077E20(s32 objectIndex) { @@ -3141,7 +3141,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077EB8.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80077EB8(s32, u16, Camera *, Camera *); /* extern */ +void func_80077EB8(s32, u16, Camera *, Camera *); /* extern */ void func_80077F64(s32 objectIndex, Camera *camera) { f64 var_f6; @@ -3187,8 +3187,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80077F64.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80077E20(); /* extern */ -? func_80077F64(); /* extern */ +void func_80077E20(); /* extern */ +void func_80077F64(); /* extern */ void func_800780CC(s32 objectIndex) { struct_80165C18_entry *sp18; @@ -3221,9 +3221,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800780CC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80077D5C(); // extern -? func_800780CC(s32, ?); // extern -extern ? D_80165C18; +void func_80077D5C(); // extern +void func_800780CC(s32, ?); // extern +extern struct_80165C18_entry D_80165C18; extern ? D_8018CC80; extern s32 D_8018D1F0; @@ -3259,7 +3259,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80078170.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_0D005770; +extern Vtx D_0D005770; extern s32 D_0D0293D8; void func_80078220(s32 objectIndex) { @@ -3389,8 +3389,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80078288.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80078220(); /* extern */ -? func_80078288(); /* extern */ +void func_80078220(); /* extern */ +void func_80078288(); /* extern */ void func_800786EC(s32 objectIndex) { struct_80165C18_entry *sp18; @@ -3423,7 +3423,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800786EC.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_8018C1B0; +extern s32 D_8018C1B0; extern s16 D_8018D174; void func_80078790(void) { @@ -3453,9 +3453,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80078790.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800786EC(s32); // extern -? func_80078790(); // extern -extern ? D_80165C18; +void func_800786EC(s32); // extern +void func_80078790(); // extern +extern struct_80165C18_entry D_80165C18; extern s32 D_8018C1B0; extern ? D_8018C278; @@ -3511,7 +3511,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800788F8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800788F8(s32, u16, ?); // extern +void func_800788F8(s32, u16, ?); // extern extern ? D_8018CC80; extern s32 D_8018D1F0; @@ -3537,7 +3537,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800789AC.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800788F8(s32, u16, Camera *); /* extern */ +void func_800788F8(s32, u16, Camera *); /* extern */ extern ? D_8018CC80; extern s32 D_8018D1F0; @@ -3586,9 +3586,9 @@ UNUSED void func_80078C68() { #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_80078170(s32, s32, s32); /* extern */ -? func_800789AC(s32, s32, ? *); /* extern */ -? func_80078A44(s32, s32, ? *); /* extern */ +void func_80078170(s32, s32, s32); /* extern */ +void func_800789AC(s32, s32, ? *); /* extern */ +void func_80078A44(s32, s32, ? *); /* extern */ static ? D_800E6A38; /* unable to generate initializer; const */ static ? D_800E6AA8; /* unable to generate initializer; const */ static ? D_800E6B00; /* unable to generate initializer; const */ @@ -3690,25 +3690,24 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80078C70.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_80183DB8; +extern s32 D_80183DB8; void func_80078F64(void) { s32 temp_v0; - temp_v0 = gScreenModeSelection; - switch (temp_v0) { /* irregular */ - case 0: + switch (gScreenModeSelection) { /* irregular */ + case SCREEN_MODE_1P: func_800723A4(D_80183DB8.unk0, 1); return; - case 2: + case SCREEN_MODE_2P_SPLITSCREEN_VERTICAL: func_800723A4(D_80183DB8.unk0, 1); func_800723A4(D_80183DB8.unk4, 1); return; - case 1: + case SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL: func_800723A4(D_80183DB8.unk0, 1); func_800723A4(D_80183DB8.unk4, 1); return; - case 3: + case SCREEN_MODE_3P_4P_SPLITSCREEN: func_800723A4(D_80183DB8.unk0, 1); func_800723A4(D_80183DB8.unk4, 1); func_800723A4(D_80183DB8.unk8, 1); @@ -3776,7 +3775,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80079114.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800C9018(u8, ?); /* extern */ +void func_800C9018(u8, ?); /* extern */ extern ? D_80165CF0; s16 gCurrentCourseId; /* unable to generate initializer */ @@ -3813,7 +3812,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800791F0.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_0D005EB0; +extern Vtx D_0D005EB0; extern s32 D_0D024ED8; extern s32 D_0F05EB50; extern s16 D_801656F0; @@ -3843,9 +3842,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800792D8.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800729EC(); /* extern */ -? func_800792D8(s32); /* extern */ -? play_sound2(?); /* extern */ +void func_800729EC(); /* extern */ +void func_800792D8(s32); /* extern */ +void play_sound2(?); /* extern */ extern s16 D_801656F0; extern s32 D_8018D160; extern s32 D_8018D168; @@ -3948,9 +3947,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80079380.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800791F0(); /* extern */ -? func_80086F10(s32, ?, ? *); /* extern */ -extern ? D_0D006730; +void func_800791F0(); /* extern */ +void func_80086F10(s32, ?, ? *); /* extern */ +extern Vtx D_0D006730; extern s32 D_0D0254D8; extern s32 D_0F07E350; extern s32 *D_8018C028; @@ -3978,7 +3977,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007963C.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007963C(); /* extern */ +void func_8007963C(); /* extern */ extern ? D_80165CBE; void func_80079700(s32 objectIndex) { @@ -4009,7 +4008,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80079700.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_80183DB8; +extern s32 D_80183DB8; s16 gCurrentCourseId; /* unable to generate initializer */ void func_800797AC(s32 playerId) { @@ -4037,8 +4036,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800797AC.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800797AC(s32); /* extern */ -extern ? D_80183DB8; +void func_800797AC(s32); /* extern */ +extern s32 D_80183DB8; void func_80079860(s32 playerId) { Player *sp18; @@ -4066,10 +4065,10 @@ void func_8007993C(s32 objectIndex, Player *player) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800791F0(); /* extern */ -? func_80086E70(s32); /* extern */ -? func_800C8F80(u8, ?); /* extern */ -extern ? D_0D005F30; +void func_800791F0(); /* extern */ +void func_80086E70(s32); /* extern */ +void func_800C8F80(u8, ?); /* extern */ +extern Vtx D_0D005F30; extern s32 D_0D025CD8; extern s32 D_0F0CCF50; @@ -4119,8 +4118,8 @@ void func_80079A5C(s32 objectIndex, Player *player) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800799A8(s32, s32); /* extern */ -? func_800C9018(u8, ?); /* extern */ +void func_800799A8(s32, s32); /* extern */ +void func_800C9018(u8, ?); /* extern */ void func_80079B40(s32 objectIndex, s32 playerId) { Player *sp34; @@ -4188,8 +4187,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80079B40.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800799A8(s32, s32); /* extern */ -? func_800C9018(u8, ?); /* extern */ +void func_800799A8(s32, s32); /* extern */ +void func_800C9018(u8, ?); /* extern */ void func_80079D44(s32 objectIndex, s32 playerId) { struct_80165C18_entry *sp2C; @@ -4281,9 +4280,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80079D44.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800791F0(); /* extern */ -? func_80086F10(s32, ?, ? *); /* extern */ -extern ? D_0D006730; +void func_800791F0(); /* extern */ +void func_80086F10(s32, ?, ? *); /* extern */ +extern Vtx D_0D006730; extern s32 D_0D0256D8; extern s32 D_0F09DB50; extern s32 *D_8018C028; @@ -4311,7 +4310,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007A060.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007A060(); /* extern */ +void func_8007A060(); /* extern */ void func_8007A124(s32 objectIndex) { struct_80165C18_entry *temp_v0; @@ -4354,9 +4353,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007A124.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800791F0(); /* extern */ -? func_80086F10(s32, ?, ? *); /* extern */ -extern ? D_0D006730; +void func_800791F0(); /* extern */ +void func_80086F10(s32, ?, ? *); /* extern */ +extern Vtx D_0D006730; extern s32 D_0D0258D8; extern s32 D_0F0AD750; extern s32 *D_8018C028; @@ -4384,7 +4383,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007A228.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007A228(); /* extern */ +void func_8007A228(); /* extern */ void func_8007A2EC(s32 objectIndex) { struct_80165C18_entry *temp_v0; @@ -4427,10 +4426,10 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007A2EC.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800791F0(); /* extern */ -? func_80086F10(s32, ?, ? *); /* extern */ -? func_800C8F80(u8, ?); /* extern */ -extern ? D_0D006730; +void func_800791F0(); /* extern */ +void func_80086F10(s32, ?, ? *); /* extern */ +void func_800C8F80(u8, ?); /* extern */ +extern Vtx D_0D006730; extern s32 D_0D025AD8; extern s32 D_0F0BD350; extern s32 *D_8018C028; @@ -4462,9 +4461,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007A3F0.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007A3F0(s32, s32); /* extern */ -? func_80086F10(s32, ?, ? *); /* extern */ -? func_800C9018(u8, ?); /* extern */ +void func_8007A3F0(s32, s32); /* extern */ +void func_80086F10(s32, ?, ? *); /* extern */ +void func_800C9018(u8, ?); /* extern */ static ? D_800E69F4; /* unable to generate initializer */ void func_8007A4D4(s32 objectIndex, s32 playerId) { @@ -4569,7 +4568,7 @@ UNUSED void func_8007A884(void) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc extern ? D_80165CBE; -extern ? D_80183DB8; +extern s32 D_80183DB8; void func_8007A88C(s32 playerId) { if ((*(&D_80165CBE + (*(&D_80183DB8 + (playerId * 4)) * 0xE0)) == 0) && (gPlayerOne[playerId].unk_0BC & 0x400000)) { @@ -4589,16 +4588,16 @@ void func_8007A910(s32 arg0) { #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_80079380(s32, s32); /* extern */ -? func_80079700(s32, s32); /* extern */ -? func_80079B40(s32, s32); /* extern */ -? func_80079D44(s32, s32); /* extern */ -? func_8007A124(s32, s32); /* extern */ -? func_8007A2EC(s32, s32); /* extern */ -? func_8007A4D4(s32, s32); /* extern */ -? func_8008BFFC(s32); /* extern */ +void func_80079380(s32, s32); /* extern */ +void func_80079700(s32, s32); /* extern */ +void func_80079B40(s32, s32); /* extern */ +void func_80079D44(s32, s32); /* extern */ +void func_8007A124(s32, s32); /* extern */ +void func_8007A2EC(s32, s32); /* extern */ +void func_8007A4D4(s32, s32); /* extern */ +void func_8008BFFC(s32); /* extern */ extern ? D_80165CF0; -extern ? D_80183DB8; +extern s32 D_80183DB8; void func_8007A948(s32 arg0) { s32 temp_s0; @@ -4643,12 +4642,12 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007A948.s") #ifdef MIPS_TO_C //generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909 -? func_80079114(s32, s32, ?); /* extern */ -? func_8007A66C(s32, s32, s32); /* extern */ -? func_8007A778(s32, s32, s32); /* extern */ -? func_8007A910(); /* extern */ +void func_80079114(s32, s32, ?); /* extern */ +void func_8007A66C(s32, s32, s32); /* extern */ +void func_8007A778(s32, s32, s32); /* extern */ +void func_8007A910(); /* extern */ extern ? D_80165CF0; -extern ? D_80183DB8; +extern s32 D_80183DB8; extern ? D_80183FA8; void func_8007AA44(s32 arg0) { @@ -4698,7 +4697,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007AA44.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_80183E88; +extern s32 D_80183E88; void func_8007ABFC(u8 arg0, s32 arg1) { s32 sp1C; @@ -4727,7 +4726,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007ABFC.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_80183E88; +extern s32 D_80183E88; void func_8007AC9C(s32 playerId) { Player *sp20; @@ -4764,8 +4763,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007AC9C.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_0D008150; -extern ? D_0D008790; +extern s8 D_0D008150; +extern s8 D_0D008790; extern ? D_0D008B14; extern u8 D_801658FD; extern u8 D_801658FF; @@ -4782,7 +4781,7 @@ u8 gen_random_item(s16 arg0, s16 arg1) { var_a1 = &D_801658FD; D_801658FD = (u8) ((u32) (random_int(0x0064U) + (D_801658FD + D_801658FF) + gRaceFrameCounter) % 100U); temp_v1 = gModeSelection; - if (temp_v1 == 2) { + if (temp_v1 == VERSUS) { temp_v0 = gPlayerCountSelection1; switch (temp_v0) { /* irregular */ case 2: @@ -4798,7 +4797,7 @@ block_8: goto block_8; } var_v1 = *((arg0 * 0x64) + sp18 + *var_a1); - } else if (temp_v1 == 3) { + } else if (temp_v1 == BATTLE) { var_v1 = *(D_801658FD + segmented_to_virtual((u32) &D_0D008B14)); } else { if (arg1 == 0) { @@ -4878,7 +4877,7 @@ s32 func_8007B040(s32 objectIndex, s32 arg1) { var_a3 = 0; var_t3 = 0; - if (gModeSelection == 0) { + if (gModeSelection == GRAND_PRIX) { if (random_int(0x0064U) < 0x51) { temp_v0 = arg1 * 4; var_v1 = func_8007AF40((s32) *(&D_80164392 + temp_v0), *(&D_801643BA + temp_v0)); @@ -4939,9 +4938,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007B040.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800C8F80(u8, ?); /* extern */ +void func_800C8F80(u8, ?); /* extern */ extern s32 D_0D01DED8; -extern ? D_0D01FED8; +extern s8 D_0D01FED8; extern s8 D_80165888; extern s16 D_8018CAB8; @@ -4983,12 +4982,12 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007B254.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007AC9C(s32); /* extern */ +void func_8007AC9C(s32); /* extern */ s8 func_8007AFB0(s32, s32); /* extern */ s32 func_8007B040(s32, s32); /* extern */ -? func_8007B254(s32, s32); /* extern */ -? func_800C8F80(u8, ?); /* extern */ -? func_800C9018(u8, ?); /* extern */ +void func_8007B254(s32, s32); /* extern */ +void func_800C8F80(u8, ?); /* extern */ +void func_800C9018(u8, ?); /* extern */ extern s32 D_0D01DED8; extern s32 D_0D01E0D8; extern s32 D_0D01E2D8; @@ -5022,7 +5021,7 @@ extern s32 D_0D023FD8; extern s32 D_0D0244D8; extern s32 D_0D0249D8; extern s8 D_80165888; -extern ? D_80183E88; +extern s32 D_80183E88; extern s32 gControllerOne; static s32 *D_800E44F0[0x10] = { &D_0D01DED8, @@ -5061,6 +5060,7 @@ static s32 *D_800E4530[0x10] = { &D_0D021CD8, }; +// have effect on object of player void func_8007B34C(s32 playerId) { s32 sp40; Player *sp38; @@ -5104,14 +5104,14 @@ void func_8007B34C(s32 playerId) { break; case 2: temp_v0 = gActiveScreenMode; - if (temp_v0 == 0) { + if (temp_v0 == SCREEN_MODE_1P) { temp_v1 = &D_8018CA70[playerId]; sp28 = temp_v1; s16_step_up_towards(&temp_v1->slideItemBoxY, 0x0040, 4); if (temp_v1->slideItemBoxY == 0x0040) { func_80072488(temp_s0); } - } else if (temp_v0 == 3) { + } else if (temp_v0 == SCREEN_MODE_3P_4P_SPLITSCREEN) { if ((playerId == 0) || (playerId == 2)) { temp_v1_2 = &D_8018CA70[playerId]; sp28 = temp_v1_2; @@ -5168,11 +5168,11 @@ void func_8007B34C(s32 playerId) { break; case 11: temp_v0_2 = gActiveScreenMode; - if (temp_v0_2 == 0) { + if (temp_v0_2 == SCREEN_MODE_1P) { if (s16_step_down_towards((playerId * 0x84) + 0x48 + D_8018CA70, 0, 4) != 0) { func_80072488(temp_s0); } - } else if (temp_v0_2 == 3) { + } else if (temp_v0_2 == SCREEN_MODE_3P_4P_SPLITSCREEN) { if ((playerId == 0) || (playerId == 2)) { temp_v1_5 = &D_8018CA70[playerId]; sp28 = temp_v1_5; @@ -5402,7 +5402,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007BDE0.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007BDE0(); /* extern */ +void func_8007BDE0(); /* extern */ void func_8007BEC8(s32 objectIndex) { struct_80165C18_entry *temp_v0; @@ -5527,9 +5527,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007BFB0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800723A4(s32, ?); // extern -? func_8007BEC8(s32); // extern -? func_8007BFB0(s32); // extern +void func_800723A4(s32, ?); // extern +void func_8007BEC8(s32); // extern +void func_8007BFB0(s32); // extern extern s8 D_801658BC; extern ? D_80165CBE; extern s32 D_80183F28; @@ -5556,8 +5556,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C280.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8007BDA8(); // extern -? func_8007C280(); // extern +void func_8007BDA8(); // extern +void func_8007C280(); // extern void func_8007C2F8(s32 arg0) { if (arg0 != 0) { @@ -5613,7 +5613,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C360.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc u16 func_800417B4(u16, s32); /* extern */ -? func_8007C360(s32, s32); /* extern */ +void func_8007C360(s32, s32); /* extern */ void func_8007C420(s32 objectIndex, void *arg1, s32 arg2) { struct_80165C18_entry *sp18; @@ -5668,7 +5668,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C4A4.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc u16 func_800417B4(u16, s32); /* extern */ -? func_8007C4A4(s32); /* extern */ +void func_8007C4A4(s32); /* extern */ void func_8007C550(s32 objectIndex) { struct_80165C18_entry *sp18; @@ -5714,8 +5714,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C5B4.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007C5B4(s16); /* extern */ -? func_80086F60(s32); /* extern */ +void func_8007C5B4(s16); /* extern */ +void func_80086F60(s32); /* extern */ void func_8007C684(s32 objectIndex) { struct_80165C18_entry *sp30; @@ -5759,12 +5759,12 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C684.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800723A4(s32, ?); // extern -? func_800C9060(s32, ?); // extern +void func_800723A4(s32, ?); // extern +void func_800C9060(s32, ?); // extern extern s32 D_800E5D9C; extern ? D_800E5DB0; -extern ? D_80165C18; -extern ? D_8018BFA8; +extern struct_80165C18_entry D_80165C18; +extern s32 D_8018BFA8; extern s16 D_8018CFF0; extern s16 D_8018D048; @@ -5858,7 +5858,7 @@ s16 func_8007C9F8(void) { return 0; } if (temp_v0 == 2) { - if (gModeSelection == 0) { + if (gModeSelection == GRAND_PRIX) { if (gPlayerPositions->unk0 < gPlayerPositions->unk4) { return 0; } @@ -5874,8 +5874,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007C9F8.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007C7B4(?, s16); /* extern */ -? func_8007C91C(?, s16); /* extern */ +void func_8007C7B4(?, s16); /* extern */ +void func_8007C91C(?, s16); /* extern */ s16 func_8007C9F8(); /* extern */ extern s16 D_8018CFF0; extern s16 D_8018D018; @@ -5944,10 +5944,10 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007CA70.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007C550(s32); /* extern */ -? func_8007C684(s32); /* extern */ -? func_8007CA70(); /* extern */ -? func_8008B78C(s32); /* extern */ +void func_8007C550(s32); /* extern */ +void func_8007C684(s32); /* extern */ +void func_8007CA70(); /* extern */ +void func_8008B78C(s32); /* extern */ extern ? D_8018BFD0; static ? D_800E4470; /* unable to generate initializer */ static ? D_800E44B0; /* unable to generate initializer */ @@ -6023,7 +6023,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007CE0C.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007CE0C(s32); /* extern */ +void func_8007CE0C(s32); /* extern */ void func_8007CEDC(s32 objectIndex) { s16 temp_v0; @@ -6080,11 +6080,11 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007CEDC.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007C420(s32, void *, void *); /* extern */ -? func_8007CEDC(s32); /* extern */ -? func_8008B724(s32); /* extern */ +void func_8007C420(s32, void *, void *); /* extern */ +void func_8007CEDC(s32); /* extern */ +void func_8008B724(s32); /* extern */ extern s32 D_8016559C; -extern ? D_8018C1B0; +extern s32 D_8018C1B0; extern s32 D_8018C1D8; extern ? D_8018C228; extern void *D_8018CF14; @@ -6271,7 +6271,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007D360.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007D360(); /* extern */ +void func_8007D360(); /* extern */ void func_8007D6A8(s32 objectIndex) { struct_80165C18_entry *sp18; @@ -6292,12 +6292,12 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007D6A8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s32 func_80072044(? *, ? *, ?); // extern -? func_800723A4(s32, ?); // extern -? func_8007D6A8(s32, s32); // extern -extern ? D_80183E4C; -extern ? D_80183E5C; -extern ? D_8018C3F0; -extern ? D_8018C630; +void func_800723A4(s32, ?); // extern +void func_8007D6A8(s32, s32); // extern +extern s32 D_80183E4C; +extern s32 D_80183E5C; +extern s32 D_8018C3F0; +extern s32 D_8018C630; void func_8007D714(s32 arg0) { s32 sp1C; @@ -6320,7 +6320,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007D714.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80089A04(?, ?); // extern +void func_80089A04(?, ?); // extern void func_8007D794(void) { s32 temp_v0; @@ -6430,7 +6430,7 @@ void func_8007DAF8(s32 objectIndex, s32 arg1) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007D794(s32); /* extern */ +void func_8007D794(s32); /* extern */ extern s32 D_8018C3F0; extern ? D_8018C490; extern s32 D_8018C630; @@ -6521,7 +6521,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007DB44.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800C9EF4(f32 *, ?); /* extern */ +void func_800C9EF4(f32 *, ?); /* extern */ void func_8007DDC0(s32 objectIndex) { f32 sp2C; @@ -6553,7 +6553,7 @@ void func_8007DDC0(s32 objectIndex) { } if (temp_s0->unk_04C == 0) { temp_v0_3 = gCCSelection; - if ((temp_v0_3 == 0) || (temp_v0_3 == 1) || (temp_v0_3 == 2) || (temp_v0_3 == 3)) { + if ((temp_v0_3 == CC_50) || (temp_v0_3 == CC_100) || (temp_v0_3 == CC_150) || (temp_v0_3 == CC_EXTRA)) { sp2C = 1150.0f; } func_8008A6DC(objectIndex, sp2C); @@ -6615,8 +6615,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007DF20.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007D714(?); /* extern */ -? func_8007DF20(s32); /* extern */ +void func_8007D714(?); /* extern */ +void func_8007DF20(s32); /* extern */ extern s32 D_80165594; extern s16 D_8018CFB0; @@ -6682,8 +6682,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E00C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8007DDC0(s32); // extern -? func_8007E00C(s32); // extern +void func_8007DDC0(s32); // extern +void func_8007E00C(s32); // extern extern s32 D_80183EA4; void func_8007E1AC(void) { @@ -6703,7 +6703,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E1AC.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800C9EF4(f32 *, ?); /* extern */ +void func_800C9EF4(f32 *, ?); /* extern */ void func_8007E1F4(s32 objectIndex) { f32 sp2C; @@ -6735,7 +6735,7 @@ void func_8007E1F4(s32 objectIndex) { } if (temp_s0->unk_04C == 0) { temp_v0_3 = gCCSelection; - if ((temp_v0_3 == 0) || (temp_v0_3 == 1) || (temp_v0_3 == 2) || (temp_v0_3 == 3)) { + if ((temp_v0_3 == CC_50) || (temp_v0_3 == CC_100) || (temp_v0_3 == CC_150) || (temp_v0_3 == CC_EXTRA)) { sp2C = 700.0f; } func_8008A6DC(objectIndex, sp2C); @@ -6787,8 +6787,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E358.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007D714(?); /* extern */ -? func_8007E358(); /* extern */ +void func_8007D714(?); /* extern */ +void func_8007E358(); /* extern */ extern s32 D_80165598; extern ? D_80165CBE; extern s16 D_8018CFE8; @@ -6830,8 +6830,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E3EC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8007E1F4(s32); // extern -? func_8007E3EC(s32); // extern +void func_8007E1F4(s32); // extern +void func_8007E3EC(s32); // extern extern s32 D_80183EA8; void func_8007E4C4(void) { @@ -6898,8 +6898,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007E59C.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80072AAC(s32, ?, ?); /* extern */ -? func_80080DE4(s32); /* extern */ +s32 func_80072AAC(s32, ?, ?); /* extern */ +void func_80080DE4(s32); /* extern */ void func_8007E63C(s32 objectIndex) { struct_80165C18_entry *sp28; @@ -7107,9 +7107,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007EC30.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc s32 func_8007E59C(s32); /* extern */ -? func_8007E63C(s32); /* extern */ -? func_8007EC30(s32); /* extern */ -? func_8008BF18(s32); /* extern */ +void func_8007E63C(s32); /* extern */ +void func_8007EC30(s32); /* extern */ +void func_8008BF18(s32); /* extern */ void func_8007ED6C(s32 objectIndex) { struct_80165C18_entry *sp24; @@ -7391,8 +7391,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007F280.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8007EFBC(); // extern -? func_8007F280(); // extern +void func_8007EFBC(); // extern +void func_8007F280(); // extern extern ? D_80165CF5; void func_8007F544(s32 arg0) { @@ -7414,9 +7414,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007F544.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007E63C(s32); /* extern */ -? func_8007EE5C(s32); /* extern */ -? func_8007F544(s32); /* extern */ +void func_8007E63C(s32); /* extern */ +void func_8007EE5C(s32); /* extern */ +void func_8007F544(s32); /* extern */ extern ? D_80165CBE; void func_8007F5A8(s32 objectIndex) { @@ -7736,8 +7736,8 @@ void func_8007FEA4(s32 objectIndex) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8007FB48(); // extern -? func_8007FEA4(); // extern +void func_8007FB48(); // extern +void func_8007FEA4(); // extern extern ? D_80165CF5; void func_8007FF5C(s32 arg0) { @@ -7759,9 +7759,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8007FF5C.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007E63C(s32); /* extern */ -? func_8007FA08(s32); /* extern */ -? func_8007FF5C(s32); /* extern */ +void func_8007E63C(s32); /* extern */ +void func_8007FA08(s32); /* extern */ +void func_8007FF5C(s32); /* extern */ extern ? D_80165CBE; void func_8007FFC0(s32 objectIndex) { @@ -7843,9 +7843,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80080078.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007E63C(s32); /* extern */ -? func_80080078(s32); /* extern */ -? func_8008BF18(s32); /* extern */ +void func_8007E63C(s32); /* extern */ +void func_80080078(s32); /* extern */ +void func_8008BF18(s32); /* extern */ void func_800801FC(s32 objectIndex) { struct_80165C18_entry *temp_v0; @@ -7919,8 +7919,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800802C0.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800802C0(s32); /* extern */ -? func_8008BF18(s32); /* extern */ +void func_800802C0(s32); /* extern */ +void func_8008BF18(s32); /* extern */ void func_80080408(s32 objectIndex) { struct_80165C18_entry *sp2C; @@ -8063,8 +8063,8 @@ void func_8008085C(s32 objectIndex) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007E63C(s32); /* extern */ -? func_80080524(s32); /* extern */ +void func_8007E63C(s32); /* extern */ +void func_80080524(s32); /* extern */ extern s32 D_8018D40C; extern s32 gGamestate; @@ -8142,10 +8142,10 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80080A4C.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80072180(); /* extern */ -? func_80075304(void *, ?, ?, s32); /* extern */ -? func_80080DE4(s32); /* extern */ -? func_80089474(s32, s32, ?, ?, s32); /* extern */ +void func_80072180(); /* extern */ +void func_80075304(void *, ?, ?, s32); /* extern */ +void func_80080DE4(s32); /* extern */ +void func_80089474(s32, s32, ?, ?, s32); /* extern */ extern s32 D_8018D3C4; void func_80080B28(s32 objectIndex, s32 playerId) { @@ -8283,9 +8283,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80080E8C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s32 func_80072044(? *, ? *, ?); // extern -? func_80080E8C(s32, s32, s32); // extern -extern ? D_80183E4C; -extern ? D_8018C3F0; +void func_80080E8C(s32, s32, s32); // extern +extern s32 D_80183E4C; +extern s32 D_8018C3F0; void func_80080FEC(s32 arg0) { s32 temp_s0; @@ -8336,8 +8336,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081080.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80081080(s32); /* extern */ -? func_8008775C(s32); /* extern */ +void func_80081080(s32); /* extern */ +void func_8008775C(s32); /* extern */ void func_800810F4(s32 objectIndex) { struct_80165C18_entry *sp30; @@ -8377,22 +8377,22 @@ void func_80081208(void) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8007542C(?); /* extern */ -? func_8007ED6C(s32); /* extern */ -? func_8007F5A8(s32); /* extern */ -? func_8007F8D8(); /* extern */ -? func_8007FFC0(s32); /* extern */ -? func_800801FC(s32); /* extern */ -? func_80080408(s32); /* extern */ -? func_800808CC(s32); /* extern */ -? func_80080A14(s32, Player *); /* extern */ -? func_80080A4C(s32, s32); /* extern */ -? func_80080B28(s32, s32); /* extern */ -? func_80080FEC(s32); /* extern */ -? func_800810F4(s32); /* extern */ -? func_8008A4CC(s32); /* extern */ +void func_8007542C(?); /* extern */ +void func_8007ED6C(s32); /* extern */ +void func_8007F5A8(s32); /* extern */ +void func_8007F8D8(); /* extern */ +void func_8007FFC0(s32); /* extern */ +void func_800801FC(s32); /* extern */ +void func_80080408(s32); /* extern */ +void func_800808CC(s32); /* extern */ +void func_80080A14(s32, Player *); /* extern */ +void func_80080A4C(s32, s32); /* extern */ +void func_80080B28(s32, s32); /* extern */ +void func_80080FEC(s32); /* extern */ +void func_800810F4(s32); /* extern */ +void func_8008A4CC(s32); /* extern */ extern s16 D_80165750; -extern ? D_80165834; +extern Vec3s D_80165834; extern s32 D_8018C3F0; extern ? D_8018C5F0; @@ -8671,7 +8671,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081924.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8008B724(s32); /* extern */ +void func_8008B724(s32); /* extern */ extern ? D_80165CF5; void func_80081A88(s32 objectIndex) { @@ -8696,11 +8696,11 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081A88.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8008153C(s32); /* extern */ -? func_80081848(s32, s32); /* extern */ -extern ? D_8018D198; -extern ? D_8018D1A8; -extern ? D_8018D1B8; +void func_8008153C(s32); /* extern */ +void func_80081848(s32, s32); /* extern */ +extern s8 D_8018D198; +extern s8 D_8018D1A8; +extern s8 D_8018D1B8; void func_80081AFC(s32 objectIndex, s32 arg1) { ? *sp2C; @@ -8772,7 +8772,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081AFC.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80072180(); /* extern */ +void func_80072180(); /* extern */ s32 func_80088DA4(s32, Player *); /* extern */ extern s32 D_8018D158; @@ -8837,9 +8837,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081D34.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc extern f32 D_8018D01C; -extern ? D_8018D198; -extern ? D_8018D1A8; -extern ? D_8018D1B8; +extern s8 D_8018D198; +extern s8 D_8018D1A8; +extern s8 D_8018D1B8; static ? D_800E6360; /* unable to generate initializer */ void func_80081FF4(s32 objectIndex, s32 arg1) { @@ -8907,9 +8907,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80081FF4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80081A88(s32); // extern -? func_80081AFC(); // extern -? func_80081D34(s32); // extern +void func_80081A88(s32); // extern +void func_80081AFC(); // extern +void func_80081D34(s32); // extern extern ? D_80165CBE; void func_800821AC(s32 arg0) { @@ -8925,9 +8925,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800821AC.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80081790(s32); /* extern */ -? func_80081FF4(s32, ?); /* extern */ -? func_800821AC(s32, ?); /* extern */ +void func_80081790(s32); /* extern */ +void func_80081FF4(s32, ?); /* extern */ +void func_800821AC(s32, ?); /* extern */ extern s32 D_8018C3F0; extern ? D_8018C5F0; extern s32 D_8018D1C8; @@ -9069,7 +9069,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8008241C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8008241C(); // extern +void func_8008241C(); // extern extern ? D_80165CBE; void func_80082714(s32 arg0) { @@ -9086,8 +9086,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80082714.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800873F4(s32); /* extern */ -? func_8008B78C(s32); /* extern */ +void func_800873F4(s32); /* extern */ +void func_8008B78C(s32); /* extern */ void func_8008275C(s32 objectIndex) { f32 *sp30; @@ -9127,8 +9127,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8008275C.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80082714(s32, s32); /* extern */ -? func_8008275C(s32); /* extern */ +void func_80082714(s32, s32); /* extern */ +void func_8008275C(s32); /* extern */ extern s16 D_80165900; extern s8 D_80165908; extern s8 D_80165A90; @@ -9215,7 +9215,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80082A4C.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80082A4C(s32); /* extern */ +void func_80082A4C(s32); /* extern */ void func_80082B34(s32 objectIndex, s32 arg1) { struct_80165C18_entry *sp28; @@ -9297,7 +9297,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80082C30.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80089F24(); // extern +s32 func_80089F24(); // extern extern ? D_80165CBE; void func_80082E18(s32 arg0) { @@ -9311,9 +9311,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80082E18.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80082B34(s32, s32); /* extern */ -? func_80082C30(s32); /* extern */ -? func_80082E18(s32); /* extern */ +void func_80082B34(s32, s32); /* extern */ +void func_80082C30(s32); /* extern */ +void func_80082E18(s32); /* extern */ void func_80082E5C(void) { s32 *var_s2; @@ -9374,7 +9374,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80082F1C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80082F1C(); // extern +void func_80082F1C(); // extern extern ? D_80165CBE; void func_80083018(s32 arg0) { @@ -9395,7 +9395,7 @@ void func_80083060(s32 arg0) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80083018(s32, s32); /* extern */ +void func_80083018(s32, s32); /* extern */ void func_80083080(void) { s32 *var_s2; @@ -9422,7 +9422,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083080.s") //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc extern s32 D_06014908; extern s32 D_06014B08; -extern ? D_0D0060B0; +extern Vtx D_0D0060B0; void func_8008311C(s32 objectIndex, s32 arg1) { struct_80165C18_entry *temp_s0; @@ -9484,9 +9484,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083248.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8008311C(); /* extern */ -extern ? D_0D0060B0; -extern ? D_0D006130; +void func_8008311C(); /* extern */ +extern Vtx D_0D0060B0; +extern Vtx D_0D006130; void func_800833D0(s32 objectIndex) { struct_80165C18_entry *sp20; @@ -9521,7 +9521,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800833D0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80089F24(); // extern +s32 func_80089F24(); // extern extern ? D_80165CBE; void func_80083474(s32 arg0) { @@ -9535,10 +9535,10 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083474.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80072120(s32 *, ?); // extern -? func_80083248(s32); // extern -? func_800833D0(s32, s32); // extern -? func_80083474(s32); // extern +void func_80072120(s32 *, ?); // extern +void func_80083248(s32); // extern +void func_800833D0(s32, s32); // extern +void func_80083474(s32); // extern extern s32 D_80183F28; void func_800834B8(void) { @@ -9603,9 +9603,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083538.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s32 func_80072044(? *, ? *, ?); // extern -? func_80083538(s32, s32, s32, s32); // extern -extern ? D_80183E4C; -extern ? D_8018C3F0; +void func_80083538(s32, s32, s32, s32); // extern +extern s32 D_80183E4C; +extern s32 D_8018C3F0; extern s32 D_8018D3BC; void func_800836F0(s32 arg0) { @@ -9653,7 +9653,7 @@ void func_8008379C(s32 objectIndex) { //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc extern s32 D_06004B20; extern s32 D_06004D20; -extern ? D_0D0061B0; +extern Vtx D_0D0061B0; void func_80083868(s32 objectIndex) { struct_80165C18_entry *temp_s0; @@ -9715,8 +9715,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083948.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80083868(s16); /* extern */ -? func_80083948(s32); /* extern */ +void func_80083868(s16); /* extern */ +void func_80083948(s32); /* extern */ void func_80083A94(s32 objectIndex) { struct_80165C18_entry *sp18; @@ -9743,7 +9743,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083A94.s") //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc extern s32 D_06004B20; extern s32 D_06005D20; -extern ? D_0D0060B0; +extern Vtx D_0D0060B0; void func_80083B0C(s32 objectIndex) { struct_80165C18_entry *sp2C; @@ -9774,7 +9774,7 @@ void func_80083BE4(s32 arg0) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80083B0C(s32); /* extern */ +void func_80083B0C(s32); /* extern */ void func_80083C04(s32 objectIndex) { s16 temp_v1; @@ -9821,10 +9821,10 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083C04.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800836F0(f32 *); /* extern */ -? func_8008379C(s32); /* extern */ -? func_80083A94(s32); /* extern */ -? func_80083C04(s32); /* extern */ +void func_800836F0(f32 *); /* extern */ +void func_8008379C(s32); /* extern */ +void func_80083A94(s32); /* extern */ +void func_80083C04(s32); /* extern */ s32 func_80089B50(s32); /* extern */ extern ? D_80183F74; extern s32 D_8018C3F0; @@ -9952,9 +9952,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80083FD0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s32 func_80072044(? *, ? *, ?); // extern -? func_80083FD0(s32, s32, ?); // extern -extern ? D_80183E4C; -extern ? D_8018C3F0; +void func_80083FD0(s32, s32, ?); // extern +extern s32 D_80183E4C; +extern s32 D_8018C3F0; extern s32 D_8018D3C0; void func_8008421C(s32 arg0, ? arg1) { @@ -9982,10 +9982,10 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_8008421C.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80083F18(s32); /* extern */ -? func_8008421C(s32, s32); /* extern */ +void func_80083F18(s32); /* extern */ +void func_8008421C(s32, s32); /* extern */ extern ? D_8016582C; -extern ? D_80165834; +extern Vec3s D_80165834; extern s32 D_80183DB8; extern s32 D_8018C3F0; extern ? D_8018C5F0; @@ -10071,7 +10071,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80084430.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80084430(); /* extern */ +void func_80084430(); /* extern */ void func_8008453C(s32 objectIndex) { s16 temp_v0; @@ -10225,7 +10225,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800845C8.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800845C8(s32); /* extern */ +void func_800845C8(s32); /* extern */ void func_80084B7C(s32 objectIndex) { s16 temp_v0; @@ -10397,8 +10397,8 @@ void func_80085080(s32 arg0) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80084D2C(s32, ?); /* extern */ -? func_8008502C(s32); /* extern */ +void func_80084D2C(s32, ?); /* extern */ +void func_8008502C(s32); /* extern */ void func_800850B0(s32 objectIndex) { s16 temp_v0; @@ -10454,10 +10454,10 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800850B0.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8008453C(s32, s32); /* extern */ -? func_80084B7C(s32, s32); /* extern */ -? func_800850B0(s32, s32); /* extern */ -? func_80089820(s32, f32, f32, ?); /* extern */ +void func_8008453C(s32, s32); /* extern */ +void func_80084B7C(s32, s32); /* extern */ +void func_800850B0(s32, s32); /* extern */ +void func_80089820(s32, f32, f32, ?); /* extern */ void func_80085214(void) { s32 *var_s2; @@ -10585,7 +10585,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085534.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800853DC(); // extern +void func_800853DC(); // extern extern ? D_80165CBE; void func_80085768(s32 arg0) { @@ -10610,8 +10610,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085768.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80085534(s32); /* extern */ -? func_80085768(s32); /* extern */ +void func_80085534(s32); /* extern */ +void func_80085768(s32); /* extern */ extern void *D_802BA05C; void func_800857C0(void) { @@ -10671,7 +10671,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085878.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80085878(s32); /* extern */ +void func_80085878(s32); /* extern */ extern s32 D_8018D40C; void func_800859C8(s32 objectIndex) { @@ -10701,8 +10701,8 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_800859C8.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800859C8(s32, s32); /* extern */ -? func_80089CBC(s32, ?); /* extern */ +void func_800859C8(s32, s32); /* extern */ +s32 func_80089CBC(s32, ?); /* extern */ void func_80085AA8(void) { f32 *temp_s1; @@ -10759,7 +10759,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085C20.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80085C20(); /* extern */ +void func_80085C20(); /* extern */ extern ? D_80165CBE; void func_80085CA0(s32 objectIndex) { @@ -10816,7 +10816,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085DB8.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80085DB8(); /* extern */ +void func_80085DB8(); /* extern */ extern ? D_80165CBE; void func_80085E38(s32 objectIndex) { @@ -10864,7 +10864,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085EF8.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80085EF8(); /* extern */ +void func_80085EF8(); /* extern */ extern ? D_80165CBE; void func_80085F74(s32 objectIndex) { @@ -10906,9 +10906,9 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80085F74.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80073444(s32, void *, void *, ?, s32); // extern -? func_80085BB4(s32); // extern -? func_8008B7D4(f32, s32, s32); // extern +void func_80073444(s32, void *, void *, ?, s32); // extern +void func_80085BB4(s32); // extern +void func_8008B7D4(f32, s32, s32); // extern extern ? D_06007200; extern ? D_0600B000; extern ? D_800E6734; @@ -10928,7 +10928,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80086074.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80086074(); // extern +void func_80086074(); // extern extern ? D_80165CBE; void func_80086110(s32 arg0) { @@ -10945,10 +10945,10 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80086110.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80085CA0(s32, s32); // extern -? func_80085E38(s32, s32); // extern -? func_80085F74(s32, s32); // extern -? func_80086110(s32, s32, s32); // extern +void func_80085CA0(s32, s32); // extern +void func_80085E38(s32, s32); // extern +void func_80085F74(s32, s32); // extern +void func_80086110(s32, s32, s32); // extern void func_80086158(s32 arg0, s32 arg1) { s32 temp_a2; @@ -10986,7 +10986,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80086158.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80086158(s32, s32); /* extern */ +void func_80086158(s32, s32); /* extern */ void func_800861E0(void) { s32 *var_s3; @@ -11089,7 +11089,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80086424.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8008629C(s32, s32, s32, s32); /* extern */ +void func_8008629C(s32, s32, s32, s32); /* extern */ void func_80086528(s32 objectIndex, s32 arg1) { s16 temp_v0; @@ -11124,11 +11124,11 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80086528.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80086424(s32); /* extern */ -? func_80086528(s32, s32); /* extern */ +void func_80086424(s32); /* extern */ +void func_80086528(s32, s32); /* extern */ extern s16 D_8016347C; extern s8 D_801658C6; -extern ? D_80183EAC; +extern s32 D_80183EAC; void func_80086604(void) { s32 *var_s1; @@ -11312,7 +11312,7 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80086940.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_80086700(); // extern +void func_80086700(); // extern extern ? D_80165CBE; void func_80086C14(s32 arg0) { @@ -11372,10 +11372,10 @@ GLOBAL_ASM("asm/non_matchings/code_80071F00/func_80086C6C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800723A4(s32, ?); // extern -? func_80086940(s32); // extern -? func_80086C14(s32); // extern -? func_80086C6C(s32); // extern +void func_800723A4(s32, ?); // extern +void func_80086940(s32); // extern +void func_80086C14(s32); // extern +void func_80086C6C(s32); // extern extern s32 D_8016559C; extern s8 D_801658CE; extern s8 D_801658DC; diff --git a/src/code_80086E70.c b/src/code_80086E70.c index 10419b9e3..3c115fecd 100644 --- a/src/code_80086E70.c +++ b/src/code_80086E70.c @@ -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; diff --git a/src/code_8008C1D0.c b/src/code_8008C1D0.c index 2e07349ec..a013558f2 100644 --- a/src/code_8008C1D0.c +++ b/src/code_8008C1D0.c @@ -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) { diff --git a/src/code_80091750.c b/src/code_80091750.c index e78af9b04..a61d3d163 100644 --- a/src/code_80091750.c +++ b/src/code_80091750.c @@ -192,10 +192,10 @@ void swap_values(s32 *arg0, s32 *arg1) { #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de s32 func_80091D74(); /* extern */ -? func_800C97C4(s32); /* extern */ -? func_800C9D0C(s32); /* extern */ +void func_800C97C4(s32); /* extern */ +void func_800C9D0C(s32); /* extern */ void *func_802AA88C(? *, ? *); /* extern */ -? load_save_data(); /* extern */ +void load_save_data(); /* extern */ extern void *D_800DC5EC; extern s32 D_800E86A4; extern s32 D_8015F734; @@ -205,14 +205,14 @@ extern s32 D_8018D9B8; extern s32 D_8018D9C0; extern ? D_8018E7AC; extern ? D_8018E7B1; -extern ? D_8018E838; +extern s8 D_8018E838; extern ? D_8018E83C; extern s8 D_8018EDF4; extern s8 D_8018EDF5; extern s8 D_8018EDF6; extern s8 D_8018EE0C; -extern ? _course_mario_raceway_dl_mio0SegmentRomStart; -extern ? _data_825800SegmentRomStart; +extern u32 _course_mario_raceway_dl_mio0SegmentRomStart; +extern s32 _data_825800SegmentRomStart; extern s32 gPrevLoadedAddress; static s8 D_800E852C = 1; @@ -231,10 +231,10 @@ void func_80091B78(void) { load_save_data(); } if (func_80091D74() != 0) { - gMenuSelection = 9; + gMenuSelection = CONTROLLER_PAK_MENU; } } - if (gMenuSelection == 8) { + if (gMenuSelection == LOGO_INTRO_MENU) { gPrevLoadedAddress = D_8015F734; set_segment_base_addr(6, func_802AA88C(&_data_825800SegmentRomStart, &_course_mario_raceway_dl_mio0SegmentRomStart)); } @@ -287,7 +287,7 @@ extern s32 D_8018EB78; extern s32 D_8018EB7C; extern u8 gControllerBits; extern void *gControllerOne; -extern ? gControllerStatuses; +extern OSContStatus gControllerStatuses; s32 func_80091D74(void) { u8 sp67; @@ -356,7 +356,7 @@ void func_80091EE4(void) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80092258(); /* extern */ +void func_80092258(); /* extern */ extern s32 D_8018D9B4; extern s32 D_8018D9B8; extern s32 D_8018D9BC; @@ -390,11 +390,11 @@ void func_80091FA4(void) { add_8018D9E0_entry(0x00000097, 0x00000064, 0x000000DD, 1); add_8018D9E0_entry(0x00000098, 0, 0, 0); add_8018D9E0_entry(0x000000C7, 0, 0, 0); - if (gModeSelection == 1) { + if (gModeSelection == TIME_TRIALS) { add_8018D9E0_entry(0x000000BE, 0, 0, 0); add_8018D9E0_entry(0x0000010E, 0, 0, 0); } - if ((D_8015F890 != 0) && (gModeSelection == 1)) { + if ((D_8015F890 != 0) && (gModeSelection == TIME_TRIALS)) { add_8018D9E0_entry(0x000000BD, 0, 0, 0); } if (!(gControllerBits & 1) && (D_8018EE08 != 0)) { @@ -461,7 +461,7 @@ void func_80092224(s32 test, s32 target, s32 alternative_color) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern s32 D_8018E850; -extern ? D_8018E858; +extern s32 D_8018E858; void func_80092258(void) { ? *temp_a0; @@ -957,6 +957,7 @@ s32 get_string_width(char *buffer) { return stringWidth; } + void set_text_color(s32 arg0) { gTextColor = arg0; } @@ -1155,7 +1156,7 @@ void func_80093A30(s32 arg0) { #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de extern s32 D_8015F788; -static ? D_800F0B1C; /* unable to generate initializer; const */ +static s8 D_800F0B1C; /* unable to generate initializer; const */ void func_80093A5C(u32 arg0) { if (D_8015F788 == 0) { @@ -1232,7 +1233,7 @@ void func_80093E40(void) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80092258(); /* extern */ +void func_80092258(); /* extern */ extern s32 D_8018D9B4; extern s32 D_8018D9B8; extern s32 D_8018D9BC; @@ -1519,17 +1520,16 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_80094A64.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_80092258(); /* extern */ -? func_8009B938(); /* extern */ -? func_8009DF4C(?); /* extern */ -? func_8009DF6C(?); /* extern */ -? func_800B3F74(s32); /* extern */ +void func_80092258(); /* extern */ +void func_8009B938(); /* extern */ +void func_8009DF4C(?); /* extern */ +void func_8009DF6C(?); /* extern */ +void func_800B3F74(s32); /* extern */ extern s32 D_800E86A4; extern s8 D_8018EE08; extern u8 gControllerBits; void func_80094C60(void) { - s32 temp_t7; if (D_800E86A4 != 0) { func_80099110(); @@ -1540,14 +1540,13 @@ void func_80094C60(void) { func_800B5F30(); func_800B6014(); func_800B3F74(gMenuSelection); - temp_t7 = gMenuSelection; - switch (temp_t7) { - case 5: + switch (gMenuSelection) { + case OPTIONS_MENU: add_8018D9E0_entry(0x00000023, 0, 0, 2); add_8018D9E0_entry(0x000000F1, 0, 0, 4); add_8018D9E0_entry(0x000000F0, 0, 0, 2); break; - case 6: + case DATA_MENU: add_8018D9E0_entry(0x00000023, 0, 0, 2); add_8018D9E0_entry(0x0000008C, 0, 0, 6); add_8018D9E0_entry(0x0000007C, 0, 0, 6); @@ -1568,17 +1567,17 @@ void func_80094C60(void) { add_8018D9E0_entry(0x0000008B, 0, 0, 6); add_8018D9E0_entry(0x0000008D, 0, 0, 8); break; - case 7: + case COURSE_DATA_MENU: add_8018D9E0_entry(0x000000E6, 0, 0, 8); add_8018D9E0_entry(0x000000E7, 0, 0, 8); add_8018D9E0_entry(0x000000E8, 0, 0, 8); add_8018D9E0_entry(0x000000E9, 0, 0, 8); add_8018D9E0_entry(0x000000EA, 0, 0, 8); break; - case 8: + case LOGO_INTRO_MENU: add_8018D9E0_entry(0x000000FA, 0, 0, 0); break; - case 9: + case CONTROLLER_PAK_MENU: add_8018D9E0_entry(0x000000DA, 0, 0, 0); add_8018D9E0_entry(0x000000D2, 0, 0, 4); add_8018D9E0_entry(0x000000D4, 0, 0, 6); @@ -1589,7 +1588,7 @@ void func_80094C60(void) { add_8018D9E0_entry(0x000000D8, 0, 0, 0x0A); add_8018D9E0_entry(0x000000D9, 0, 0, 0x0A); break; - case 10: + case START_MENU: add_8018D9E0_entry(2, 0, 0, 4); add_8018D9E0_entry(1, 0, 0, 0); add_8018D9E0_entry(0x000000FB, 0, 0, 0); @@ -1602,7 +1601,7 @@ void func_80094C60(void) { D_800DC51C = 0; D_8018EE08 = 0; break; - case 11: + case MAIN_MENU: add_8018D9E0_entry(0x00000023, 0, 0, 2); add_8018D9E0_entry(0x0000000A, 0x0000015E, 0x00000011, 6); add_8018D9E0_entry(0x0000000E, 0x0000015E, 0x0000003E, 6); @@ -1622,7 +1621,7 @@ void func_80094C60(void) { add_8018D9E0_entry(0x00000018, 0, 0, 6); add_8018D9E0_entry(0x0000001B, 0, 0, 0x0C); break; - case 12: + case PLAYER_SELECT_MENU: add_8018D9E0_entry(0x00000024, 0, 0, 2); add_8018D9E0_entry(0x0000002A, 0, 0, 6); add_8018D9E0_entry(0x00000033, 0, 0, 6); @@ -1639,10 +1638,10 @@ void func_80094C60(void) { add_8018D9E0_entry(0x00000036, 0, 0, 0x0C); add_8018D9E0_entry(0x00000037, 0, 0, 0x0C); break; - case 13: + case COURSE_SELECT_MENU: add_8018D9E0_entry(0x00000025, 0, 0, 2); add_8018D9E0_entry(0x00000052, 0, 0, 6); - if (gModeSelection != 3) { + if (gModeSelection != BATTLE) { add_8018D9E0_entry(0x00000053, 0, 0, 4); add_8018D9E0_entry(0x00000054, 0, 0, 4); add_8018D9E0_entry(0x00000055, 0, 0, 4); @@ -1662,12 +1661,12 @@ void func_80094C60(void) { add_8018D9E0_entry(0x00000062, 0, 0, 6); add_8018D9E0_entry(0x0000005D, 0, 0, 6); add_8018D9E0_entry(0x0000005E, 0, 0, 8); - if (gModeSelection == 1) { + if (gModeSelection == TIME_TRIALS) { add_8018D9E0_entry(0x00000065, 0, 0, 8); add_8018D9E0_entry(0x00000066, 0, 0, 8); add_8018D9E0_entry(0x00000069, 0, 0, 8); } - if (gModeSelection == 0) { + if (gModeSelection == GRAND_PRIX) { add_8018D9E0_entry(0x00000068, 0, 0, 8); add_8018D9E0_entry(0x00000067, 0, 0, 5); } @@ -1687,9 +1686,9 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_80094C60.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_8009E230(); /* extern */ -? func_800CA0A0(); /* extern */ -? play_sound2(?); /* extern */ +void func_8009E230(); /* extern */ +void func_800CA0A0(); /* extern */ +void play_sound2(?); /* extern */ extern s8 D_8018E7B0; extern s8 D_8018EDF1; extern s8 D_8018EE0C; @@ -1734,24 +1733,23 @@ void func_80095574(void) { if (gDebugMenuSelection >= 2) { load_debug_font(); debug_print_str2(0x00000050, 0x00000064, "debug_mode"); - temp_t8 = gDebugMenuSelection; - switch (temp_t8) { - case 2: + switch (gDebugMenuSelection) { + case DEBUG_MENU_DEBUG_MODE: debug_print_str2(0x00000046, 0x00000064, "*"); break; - case 3: + case DEBUG_MENU_COURSE: debug_print_str2(0x00000046, 0x0000006E, "*"); break; - case 4: + case DEBUG_MENU_SCREEN_MODE: debug_print_str2(0x00000046, 0x00000078, "*"); break; - case 5: + case DEBUG_MENU_PLAYER: debug_print_str2(0x00000046, 0x00000082, "*"); break; - case 6: + case DEBUG_MENU_SOUND_MODE: debug_print_str2(0x00000046, 0x0000008C, "*"); break; - case 7: + case DEBUG_MENU_GIVE_ALL_GOLD_CUP: debug_print_str2(0x00000046, 0x00000096, "*"); break; } @@ -1778,12 +1776,12 @@ void func_80095574(void) { debug_print_str2(0x000000AA, 0x00000082, gDebugCharacterNames[*gCharacterSelections]); debug_print_str2(0x00000050, 0x0000008C, "sound mode"); debug_print_str2(0x000000AA, 0x0000008C, gDebugSoundModeNames[gSoundMode]); - if (gDebugMenuSelection == 7) { + if (gDebugMenuSelection == DEBUG_MENU_GIVE_ALL_GOLD_CUP) { debug_print_str2(0x00000050, 0x00000096, "push b to get all goldcup"); } func_80057778(); } - if (gDebugMenuSelection == 1) { + if (gDebugMenuSelection == DEBUG_MENU_DISABLED) { gMenuTimingCounter += 1; } else { gMenuTimingCounter = 3; @@ -1907,8 +1905,8 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_80095AE0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_80095AE0(Mtx *, s32, s32, s32, f32); /* extern */ -? rmonPrintf(? *); /* extern */ +void func_80095AE0(Mtx *, s32, s32, s32, f32); /* extern */ +void rmonPrintf(? *); /* extern */ Gfx *func_80095BD0(Gfx *arg0, s32 arg1, s32 arg2, s32 arg3, u32 arg4, s32 arg5, s32 arg6, f32 arg7) { Mtx *sp28; @@ -4003,7 +4001,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_80099A94.s") extern s32 D_8018D9B0; extern u8 *D_8018D9B4; extern void *D_8018E060; -extern ? _textures_0aSegmentRomStart; +extern u8 _textures_0aSegmentRomStart; void func_80099AEC(void) { OSIoMesg sp6C; @@ -4136,7 +4134,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_80099E60.s") extern OSMesgQueue gDmaMesgQueue; extern void *D_8018D9B4; extern void *D_8018E0E8; -extern ? _textures_0aSegmentRomStart; +extern u8 _textures_0aSegmentRomStart; void func_80099EC4(void) { ? sp68; @@ -4243,7 +4241,7 @@ void func_8009A344(void) { #ifdef MIPS_TO_C //generated by mips_to_c commit 0ca3d5f5fa5e3d957908269ac1535e7d4f12bce9 -? func_8009969C(MkTexture *, s32, MkAnimation *); /* extern */ +void func_8009969C(MkTexture *, s32, MkAnimation *); /* extern */ s32 func_8009A374(MkAnimation *arg0) { s32 sp24; @@ -4314,7 +4312,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009A374.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 0ca3d5f5fa5e3d957908269ac1535e7d4f12bce9 -? func_80099958(MkTexture *, s32, ?, s32); /* extern */ +void func_80099958(MkTexture *, s32, ?, s32); /* extern */ s32 func_8009A478(MkAnimation *arg0, s32 arg1) { s32 sp2C; @@ -4543,7 +4541,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009A944.s") #ifdef MIPS_TO_C extern s32 D_8018D9B0; -extern ? D_8018E118; +extern struct_8018E118_entry D_8018E118; UNUSED void func_8009A9FC(s32 arg0, s32 arg1, u32 arg2, s32 arg3) { s32 temp_t6; @@ -4619,7 +4617,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009AB7C.s") #ifdef MIPS_TO_C extern s32 D_8018D9B0; -extern ? D_8018E118; +extern struct_8018E118_entry D_8018E118; UNUSED void func_8009AD78(s32 arg0, s32 arg1) { s32 temp_a2; @@ -5588,14 +5586,14 @@ void func_8009CA2C(void) { #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_8009CDDC(s32, ?, s32); /* extern */ -? func_8009CDFC(s32, ?, s32); /* extern */ -? func_8009D958(s32, ?, s32); /* extern */ -? func_8009D978(s32, ?, s32); /* extern */ -? func_8009D998(s32, ?, s32); /* extern */ -? func_8009DAA8(Gfx **, ?, s32); /* extern */ -? func_8009DB8C(Gfx **, ?, s32); /* extern */ -extern ? D_0D0076F8; +void func_8009CDDC(s32, ?, s32); /* extern */ +void func_8009CDFC(s32, ?, s32); /* extern */ +void func_8009D958(s32, ?, s32); /* extern */ +void func_8009D978(s32, ?, s32); /* extern */ +void func_8009D998(s32, ?, s32); /* extern */ +void func_8009DAA8(Gfx **, ?, s32); /* extern */ +void func_8009DB8C(Gfx **, ?, s32); /* extern */ +extern Gfx D_0D0076F8; extern ? D_8018E7AC; void func_8009CA6C(s32 arg0) { @@ -5648,10 +5646,10 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009CA6C.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s32 draw_box(s32, s32, s32, s32, s32, s32, s32, s32, s32); // extern extern ? D_800E7AE8; -extern ? D_8015F480; +extern UnkStruct_800DC5EC D_8015F480; extern ? D_8018E7AC; -extern ? D_8018E7B8; -extern ? D_8018E7D0; +extern u32 D_8018E7B8; +extern s32 D_8018E7D0; extern ? D_8018E7E8; extern ? D_8018E810; extern s8 D_8018EE0C; @@ -5747,17 +5745,17 @@ void func_8009CE1C(void) { #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? func_8000F124(s8, s32); /* extern */ -? func_8009CE1C(s32 *, s32, s32); /* extern */ -? func_80290338(); /* extern */ -? func_80290360(); /* extern */ -? func_80290388(); /* extern */ -? func_802903B0(); /* extern */ +void func_8000F124(s8, s32); /* extern */ +void func_8009CE1C(s32 *, s32, s32); /* extern */ +void func_80290338(); /* extern */ +void func_80290360(); /* extern */ +void func_80290388(); /* extern */ +void func_802903B0(); /* extern */ extern s32 gGamestateNext; extern s32 D_800E86A4; extern s16 D_8015F892; extern ? D_8018E7AC; -extern ? D_8018E7B0; +extern s8 D_8018E7B0; extern u32 D_8018EDE0; extern s8 D_8018EDF3; extern s8 D_8018EDFB; @@ -5807,18 +5805,18 @@ void func_8009CE64(s32 *arg0, s32 arg2, s32 arg3) { var_a1 = 0; if (temp_v0 == (s32) 5) { temp_v1 = gCCSelection; - if ((temp_v1 != 2) && (temp_v1 != 3)) { + if ((temp_v1 != CC_150) && (temp_v1 != CC_EXTRA)) { - } else if ((D_802874F5 < 3) && (gCupSelection == 3)) { + } else if ((D_802874F5 < 3) && (gCupSelection == SPECIAL_CUP)) { var_a1 = 1; } if (var_a1 != 0) { - gMenuSelectionFromEndingSequence = 9; + gMenuSelectionFromEndingSequence = CREDITS_SEQUENCE; gCreditsCourseId = COURSE_LUIGI_RACEWAY; return; } - gMenuSelectionFromEndingSequence = 1; - gMenuSelection = 0x0000000B; + gMenuSelectionFromEndingSequence = MAIN_MENU_FROM_QUIT; + gMenuSelection = MAIN_MENU; return; } if (temp_v0 == 4) { @@ -5939,7 +5937,7 @@ void func_8009CE64(s32 *arg0, s32 arg2, s32 arg3) { } } else { *(&D_8018E7AC + var_a0) = 0; - if (gDebugMenuSelection != 0x40) { + if (gDebugMenuSelection != DEBUG_MENU_EXITED) { temp_t9 = D_8018EDE0; switch (temp_t9) { /* switch 3 */ case 0: /* switch 3 */ @@ -5947,8 +5945,8 @@ void func_8009CE64(s32 *arg0, s32 arg2, s32 arg3) { temp_v0_7 = gMenuSelection; var_a2 = 2; var_t7 = temp_v0_7 + 1; - if (temp_v0_7 == 8) { - gMenuSelection = 0x0000000A; + if (temp_v0_7 == LOGO_INTRO_MENU) { + gMenuSelection = START_MENU; D_800E86A4 = 2; } else { block_74: @@ -5963,66 +5961,66 @@ block_74: D_800DC51C = 1; D_8018EE08 = 1; gGamestateNext = 4; - gCCSelection = (s32) 1; + gCCSelection = (s32) CC_100; temp_v1_4 = (s8) gNextDemoId; switch (temp_v1_4) { /* switch 4 */ case 0: /* switch 4 */ gCurrentCourseId = 0; - gScreenModeSelection = 0; + gScreenModeSelection = SCREEN_MODE_1P; gPlayerCountSelection1 = (s32) 1; D_8018EDF3 = 1; gCharacterSelections->unk0 = 0; - gModeSelection = 0; + gModeSelection = GRAND_PRIX; break; case 1: /* switch 4 */ gCurrentCourseId = (s16) 1; var_a2 = 2; - gScreenModeSelection = (s32) 1; + gScreenModeSelection = (s32) SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL; gPlayerCountSelection1 = 2; D_8018EDF3 = (s8) 2; gCharacterSelections->unk0 = (s8) 2; gCharacterSelections->unk1 = (s8) 4; - gModeSelection = 2; + gModeSelection = VERSUS; break; case 2: /* switch 4 */ gCurrentCourseId = 0x000B; - gScreenModeSelection = 0; + gScreenModeSelection = SCREEN_MODE_1P; gPlayerCountSelection1 = (s32) 1; D_8018EDF3 = 1; gCharacterSelections->unk0 = 1; - gModeSelection = 0; + gModeSelection = GRAND_PRIX; break; case 3: /* switch 4 */ gCurrentCourseId = 0x000E; var_a2 = 2; - gScreenModeSelection = 3; + gScreenModeSelection = SCREEN_MODE_3P_4P_SPLITSCREEN; gPlayerCountSelection1 = 3; D_8018EDF3 = (s8) 3; gCharacterSelections->unk0 = 5; gCharacterSelections->unk1 = (s8) 2; gCharacterSelections->unk2 = 7; - gModeSelection = 2; + gModeSelection = VERSUS; break; case 4: /* switch 4 */ var_a2 = 2; gCurrentCourseId = (s16) 2; - gScreenModeSelection = 0; + gScreenModeSelection = SCREEN_MODE_1P; gPlayerCountSelection1 = (s32) 1; D_8018EDF3 = 1; gCharacterSelections->unk0 = 7; - gModeSelection = 0; + gModeSelection = GRAND_PRIX; break; case 5: /* switch 4 */ gCurrentCourseId = 0x000C; var_a2 = 2; - gScreenModeSelection = 3; + gScreenModeSelection = SCREEN_MODE_3P_4P_SPLITSCREEN; gPlayerCountSelection1 = 4; D_8018EDF3 = (s8) 4; gCharacterSelections->unk0 = 0; gCharacterSelections->unk1 = 1; gCharacterSelections->unk2 = 6; gCharacterSelections->unk3 = (s8) 3; - gModeSelection = 2; + gModeSelection = VERSUS; break; } gNextDemoId = temp_v1_4 + 1; @@ -6037,21 +6035,21 @@ block_74: case 3: /* switch 3 */ var_a0 = &gMenuSelection; temp_v1_5 = gMenuSelection; - if (temp_v1_5 != 6) { - if (temp_v1_5 == 0x0000000B) { - gMenuSelection = 6; + if (temp_v1_5 != DATA_MENU) { + if (temp_v1_5 == MAIN_MENU) { + gMenuSelection = DATA_MENU; } } else { - gMenuSelection = 0x0000000B; + gMenuSelection = MAIN_MENU; } break; case 4: /* switch 3 */ var_a0 = &gMenuSelection; temp_v1_6 = gMenuSelection; var_t7 = 0x0000000B; - if (temp_v1_6 != (s32) 5) { - if (temp_v1_6 == 0x0000000B) { - gMenuSelection = (s32) 5; + if (temp_v1_6 != (s32) OPTIONS_MENU) { + if (temp_v1_6 == MAIN_MENU) { + gMenuSelection = (s32) OPTIONS_MENU; } } else { goto block_74; @@ -6063,7 +6061,7 @@ block_74: } if (gMenuSelection >= 0xE) { gGamestateNext = 4; - if (gModeSelection == 1) { + if (gModeSelection == TIME_TRIALS) { D_8018EDFB = (s8) 1; } func_8009CE1C(var_a0, 1, var_a2); @@ -6071,42 +6069,41 @@ block_74: D_8018EE0C = 0; return; } - temp_v1_7 = gDebugGotoScene; - switch (temp_v1_7) { /* switch 5; irregular */ - case 1: /* switch 5 */ + switch (gDebugGotoScene) { /* switch 5; irregular */ + case DEBUG_GOTO_ENDING_SEQUENCE: /* switch 5 */ gGamestateNext = (s32) 5; break; - case 2: /* switch 5 */ - case 3: /* switch 5 */ + case DEBUG_GOTO_CREDITS_SEQUENCE_CC_50: /* switch 5 */ + case DEBUG_GOTO_CREDITS_SEQUENCE_CC_EXTRA: /* switch 5 */ gGamestateNext = 9; gCreditsCourseId = COURSE_LUIGI_RACEWAY; break; default: /* switch 5 */ gGamestateNext = 4; - if (gModeSelection == (s32) 1) { + if (gModeSelection == (s32) TIME_TRIALS) { D_8018EDFB = 1; } break; } func_8000F124(1, 2); - if ((gScreenModeSelection == 3) && ((temp_v1_8 = gModeSelection, (temp_v1_8 == 0)) || (temp_v1_8 == 1))) { - gModeSelection = 2; + if ((gScreenModeSelection == SCREEN_MODE_3P_4P_SPLITSCREEN) && ((temp_v1_8 = gModeSelection, (temp_v1_8 == GRAND_PRIX)) || (temp_v1_8 == TIME_TRIALS))) { + gModeSelection = VERSUS; } temp_a0 = gCurrentCourseId; if ((temp_a0 != 0x000F) && (temp_a0 != 0x0010) && (temp_a0 != 0x0011) && (temp_a0 != 0x0013)) { var_v0 = gModeSelection; - if (var_v0 == 3) { - gModeSelection = 0; - var_v0 = 0; + if (var_v0 == BATTLE) { + gModeSelection = GRAND_PRIX; + var_v0 = GRAND_PRIX; } - if ((var_v0 == 2) && (gPlayerCountSelection1 == 1)) { - gModeSelection = 0; + if ((var_v0 == VERSUS) && (gPlayerCountSelection1 == 1)) { + gModeSelection = GRAND_PRIX; } } else { - gModeSelection = 3; + gModeSelection = BATTLE; if (gPlayerCountSelection1 == 1) { D_8018EDF3 = (s8) 2; - gScreenModeSelection = 1; + gScreenModeSelection = SCREEN_MODE_2P_SPLITSCREEN_HORIZONTAL; gPlayerCountSelection1 = (s32) D_8018EDF3; } } @@ -6116,13 +6113,13 @@ block_74: gCupCourseSelection = (s8) gPerCupIndexByCourseId[temp_a0]; switch (temp_v1_9) { /* switch 6; irregular */ case 2: /* switch 6 */ - gCCSelection = 0; + gCCSelection = CC_50; return; case 3: /* switch 6 */ - gCCSelection = 3; + gCCSelection = CC_EXTRA; return; default: /* switch 6 */ - if (gCCSelection == 3) { + if (gCCSelection == CC_EXTRA) { gIsMirrorMode = 1; return; } @@ -6140,11 +6137,11 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009CE64.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s32 draw_box(s32, s32, s32, s32, s32, s32, s32, s32, u32); // extern -? func_8009CE64(s32); // extern +void func_8009CE64(s32); // extern extern ? D_800E7AE8; -extern ? D_8015F480; -extern ? D_8018E7B8; -extern ? D_8018E7D0; +extern UnkStruct_800DC5EC D_8015F480; +extern u32 D_8018E7B8; +extern s32 D_8018E7D0; extern ? D_8018E7E8; extern ? D_8018E810; extern s32 gDisplayListHead; @@ -6234,7 +6231,7 @@ void func_8009D978(s32 arg0, s32 arg1) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 s32 draw_box(s32, s32, s32, s32, s32, s32, s32, s32, s32); // extern -extern ? D_8015F480; +extern UnkStruct_800DC5EC D_8015F480; extern ? D_8018E7E8; extern ? D_8018E810; extern s32 gDisplayListHead; @@ -6292,9 +6289,9 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009D998.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 void *draw_box(void *, ?, ?, ?, s32, s32, s32, s32, u32); // extern -? func_8009CE64(?, ? *); // extern +void func_8009CE64(?, ? *); // extern extern u32 D_8018E7C8; -extern ? D_8018E7D0; +extern s32 D_8018E7D0; extern void *gDisplayListHead; void func_8009DAA8(void) { @@ -6326,10 +6323,10 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009DAA8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 void *draw_box(void *, ?, ?, ?, s32, s32, s32, s32, u32); // extern -? func_8009CE64(?); // extern +void func_8009CE64(?); // extern extern s32 D_8018D9B8; extern u32 D_8018E7C8; -extern ? D_8018E7D0; +extern s32 D_8018E7D0; extern void *gDisplayListHead; void func_8009DB8C(void) { @@ -6444,7 +6441,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009DB8C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern ? D_8018E7AC; -extern ? D_8018E7B8; +extern u32 D_8018E7B8; extern s32 D_8018E7E0; void func_8009DEF8(u32 arg0, s8 arg1) { @@ -6480,7 +6477,7 @@ void func_8009DF6C(s32 arg0) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern ? D_8018E7AC; -extern ? D_8018E7B8; +extern u32 D_8018E7B8; extern s32 D_8018E7E0; void func_8009DF8C(u32 arg0, s8 arg1) { @@ -6516,8 +6513,8 @@ void func_8009E000(s32 arg0) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern ? D_8018E7AC; -extern ? D_8018E7B8; -extern ? D_8018E7D0; +extern u32 D_8018E7B8; +extern s32 D_8018E7D0; void func_8009E020(s32 arg0, u32 arg1) { s32 temp_v0_2; @@ -6550,8 +6547,8 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E020.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern ? D_8018E7AC; -extern ? D_8018E7B8; -extern ? D_8018E7D0; +extern u32 D_8018E7B8; +extern s32 D_8018E7D0; void func_8009E088(s32 arg0, u32 arg1) { s32 temp_v0_2; @@ -6585,7 +6582,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_8009E088.s") //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 extern s32 D_8018D9B8; extern ? D_8018E7AC; -extern ? D_8018E7B8; +extern u32 D_8018E7B8; extern s32 D_8018E7E0; void func_8009E0F0(u32 arg0) { @@ -6659,8 +6656,8 @@ void func_8009E280(void) { #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_8009E2F0(); // extern -extern ? D_8018E838; +void func_8009E2F0(); // extern +extern s8 D_8018E838; void func_8009E2A8(s32 arg0) { s8 *temp_v1; @@ -6689,7 +6686,7 @@ extern ? D_800F0B28; extern ? D_8018E7E8; extern ? D_8018E810; extern s8 D_8018E838; -extern ? D_8018E840; +extern s32 D_8018E840; extern s32 gDisplayListHead; void func_8009E2F0(s32 arg0) { @@ -6799,19 +6796,19 @@ struct _struct_D_800E8234_0x8 { }; /* size = 0x8 */ s32 func_800051C4(); /* extern */ -? func_8006EF60(); /* extern */ -? func_800996BC(MkTexture *, ?, s8); /* extern */ +void func_8006EF60(); /* extern */ +void func_800996BC(MkTexture *, ?, s8); /* extern */ s32 func_8009A374(void *); /* extern */ s32 func_8009A478(void *, s32); /* extern */ -? func_8009B0A4(?, ?); /* extern */ -? func_8009B538(?, ?, u16, u16, s32); /* extern */ +void func_8009B0A4(?, ?); /* extern */ +void func_8009B538(?, ?, u16, u16, s32); /* extern */ u32 func_8009B8C4(u64 *); /* extern */ -? func_8009B954(MkTexture *); /* extern */ -? func_8009B998(); /* extern */ +void func_8009B954(MkTexture *); /* extern */ +void func_8009B998(); /* extern */ s32 func_800B5020(s32, s8, s8); /* extern */ s32 func_800B5218(); /* extern */ s32 func_800B5B94(); /* extern */ -? func_800B6708(); /* extern */ +void func_800B6708(); /* extern */ extern ? D_801640F4; extern s32 D_8018CA78; extern s8 D_8018ED90; @@ -6945,6 +6942,8 @@ static MkTexture *D_800E8274[8] = { D_020049E4, D_02004A34, }; + +// texture use in menu static MkTexture *D_800E8294[8] = { D_020048F4, D_0200491C, @@ -6977,7 +6976,7 @@ static MkAnimation *gCharacterDefeatAnimation[8] = { D_02006CB0, }; static ? D_800EFD64; /* unable to generate initializer; const */ -extern ? gCupCourseOrder; +extern s16 gCupCourseOrder; MkTexture *D_800E7D74[0x14] = { D_02001B2C, D_02001B54, @@ -7423,8 +7422,8 @@ loop_3: temp_v0_8 = gModeSelection; temp_a1 = *(&D_800EFD64 + *(&D_800E85F7 + type)); var_v1_3 = 0; - if (temp_v0_8 != 2) { - if (temp_v0_8 != 3) { + if (temp_v0_8 != VERSUS) { + if (temp_v0_8 != BATTLE) { var_a2 = type * 4; } else { var_a2 = type * 4; @@ -7524,43 +7523,43 @@ Gfx *func_800959CC(Gfx *, s32, s32, s32, s32); /* extern */ Gfx *func_80096CD8(Gfx *, ?, ?, ?, s32); /* extern */ Gfx *func_8009B9D0(Gfx *, MkTexture *); /* extern */ Gfx *func_8009BC9C(Gfx *, MkTexture *, s32, s32, s32, s32); /* extern */ -? func_800A09E0(struct_8018D9E0_entry *); /* extern */ -? func_800A0B80(struct_8018D9E0_entry *); /* extern */ -? func_800A0DFC(s32); /* extern */ -? func_800A0EB8(struct_8018D9E0_entry *, s32); /* extern */ -? func_800A0FA4(struct_8018D9E0_entry *, s32); /* extern */ -? func_800A10CC(struct_8018D9E0_entry *); /* extern */ -? func_800A12BC(struct_8018D9E0_entry *, void *); /* extern */ -? func_800A143C(struct_8018D9E0_entry *, s32); /* extern */ -? func_800A1500(struct_8018D9E0_entry *); /* extern */ -? func_800A1780(struct_8018D9E0_entry *); /* extern */ -? func_800A1BE0(struct_8018D9E0_entry *); /* extern */ -? func_800A1DE0(struct_8018D9E0_entry *); /* extern */ -? func_800A1F30(struct_8018D9E0_entry *); /* extern */ -? func_800A1FB0(struct_8018D9E0_entry *); /* extern */ -? func_800A2D1C(struct_8018D9E0_entry *); /* extern */ -? func_800A2EB8(struct_8018D9E0_entry *); /* extern */ -? func_800A34A8(struct_8018D9E0_entry *); /* extern */ -? func_800A3E60(struct_8018D9E0_entry *); /* extern */ -? func_800A4A24(struct_8018D9E0_entry *); /* extern */ -? func_800A5738(struct_8018D9E0_entry *); /* extern */ -? func_800A6154(struct_8018D9E0_entry *); /* extern */ -? func_800A638C(struct_8018D9E0_entry *); /* extern */ -? func_800A70E8(struct_8018D9E0_entry *); /* extern */ -? func_800A761C(struct_8018D9E0_entry *); /* extern */ -? func_800A8270(s32, struct_8018D9E0_entry *); /* extern */ -? func_800A8564(struct_8018D9E0_entry *); /* extern */ -? func_800A874C(struct_8018D9E0_entry *); /* extern */ -? func_800A890C(s32, struct_8018D9E0_entry *); /* extern */ -? func_800A8A98(struct_8018D9E0_entry *); /* extern */ -? func_800A8CA4(struct_8018D9E0_entry *); /* extern */ -? func_800A8F48(struct_8018D9E0_entry *); /* extern */ -? func_800A90D4(s32, struct_8018D9E0_entry *); /* extern */ -extern ? D_800E86AC; -extern ? D_800E86B0; -extern ? D_8018EDE8; +void func_800A09E0(struct_8018D9E0_entry *); /* extern */ +void func_800A0B80(struct_8018D9E0_entry *); /* extern */ +void func_800A0DFC(s32); /* extern */ +void func_800A0EB8(struct_8018D9E0_entry *, s32); /* extern */ +void func_800A0FA4(struct_8018D9E0_entry *, s32); /* extern */ +void func_800A10CC(struct_8018D9E0_entry *); /* extern */ +void func_800A12BC(struct_8018D9E0_entry *, void *); /* extern */ +void func_800A143C(struct_8018D9E0_entry *, s32); /* extern */ +void func_800A1500(struct_8018D9E0_entry *); /* extern */ +void func_800A1780(struct_8018D9E0_entry *); /* extern */ +void func_800A1BE0(struct_8018D9E0_entry *); /* extern */ +void func_800A1DE0(struct_8018D9E0_entry *); /* extern */ +void func_800A1F30(struct_8018D9E0_entry *); /* extern */ +void func_800A1FB0(struct_8018D9E0_entry *); /* extern */ +void func_800A2D1C(struct_8018D9E0_entry *); /* extern */ +void func_800A2EB8(struct_8018D9E0_entry *); /* extern */ +void func_800A34A8(struct_8018D9E0_entry *); /* extern */ +void func_800A3E60(struct_8018D9E0_entry *); /* extern */ +void func_800A4A24(struct_8018D9E0_entry *); /* extern */ +void func_800A5738(struct_8018D9E0_entry *); /* extern */ +void func_800A6154(struct_8018D9E0_entry *); /* extern */ +void func_800A638C(struct_8018D9E0_entry *); /* extern */ +void func_800A70E8(struct_8018D9E0_entry *); /* extern */ +void func_800A761C(struct_8018D9E0_entry *); /* extern */ +void func_800A8270(s32, struct_8018D9E0_entry *); /* extern */ +void func_800A8564(struct_8018D9E0_entry *); /* extern */ +void func_800A874C(struct_8018D9E0_entry *); /* extern */ +void func_800A890C(s32, struct_8018D9E0_entry *); /* extern */ +void func_800A8A98(struct_8018D9E0_entry *); /* extern */ +void func_800A8CA4(struct_8018D9E0_entry *); /* extern */ +void func_800A8F48(struct_8018D9E0_entry *); /* extern */ +void func_800A90D4(s32, struct_8018D9E0_entry *); /* extern */ +extern s8 D_800E86AC; +extern s8 D_800E86B0; +extern s8 D_8018EDE8; extern s8 D_802874F6; -extern ? gGameModeFromNumPlayersAndRowSelection; +extern s32 gGameModeFromNumPlayersAndRowSelection; extern s8 gMainMenuSelectionDepth; static s8 *D_800E7594[0xC] = { "luigi raceway", @@ -7606,6 +7605,8 @@ static MkTexture *D_800E7CA8[0x19] = { D_020014A0, }; static MkTexture *D_800E7D4C[2] = { D_02004598, D_020045C0 }; + +// name selection static MkTexture *D_800E7D54[8] = { D_02001A8C, D_02001A64, @@ -7645,6 +7646,7 @@ static MkTexture *D_800E817C[0x1A] = { D_0200419C, }; static MkTexture *D_800E824C[2] = { D_0200478C, D_02004854 }; + static MkTexture *D_800E8254[8] = { D_02004660, D_02004688, @@ -8354,7 +8356,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A08D8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800A08D8(s32, s32, ?); // extern +void func_800A08D8(s32, s32, ?); // extern s32 func_800A095C(s8 *arg0, s32 arg1, s32 arg2, ? arg3) { s32 temp_s1; @@ -8425,7 +8427,7 @@ void func_800A0AD0(UNUSED struct_8018D9E0_entry *unused) { #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_800A08D8(u8, s32, s32); /* extern */ +void func_800A08D8(u8, s32, s32); /* extern */ s32 func_800A095C(void *, ?, ?, s32); /* extern */ extern ? D_8018E938; extern ? D_8018EB34; @@ -8580,6 +8582,8 @@ struct _struct_D_800E8234_0x8 { }; /* size = 0x8 */ Gfx *func_8009BC9C(Gfx *, void *, s32, s32, s32, s32); /* extern */ + +// menu selection static struct _struct_D_800E8234_0x8 D_800E8234[3] = { { D_02004688, D_020047DC }, { D_020046D8, D_02004804 }, @@ -8851,7 +8855,7 @@ void func_800A1A20(struct_8018D9E0_entry *arg0) { #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_800A66A8(struct_8018D9E0_entry *, s16 *); /* extern */ +void func_800A66A8(struct_8018D9E0_entry *, s16 *); /* extern */ static s8 *D_800E7834[3] = { "return to menu", "erase records for this course", @@ -8920,7 +8924,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A1BE0.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_800A66A8(struct_8018D9E0_entry *, s16 *); /* extern */ +void func_800A66A8(struct_8018D9E0_entry *, s16 *); /* extern */ extern s8 D_8018EDF9; static s8 *D_800E7840[2] = { "quit", "erase" }; /* const */ static struct _struct_D_800E7848_0xC D_800E7848[2]; /* unable to generate initializer; const */ @@ -9002,9 +9006,9 @@ struct _struct_D_800E7900_0xC { /* 0x4 */ char pad4[8]; /* maybe part of unk0[3]? */ }; /* size = 0xC */ -? func_800A66A8(struct_8018D9E0_entry *, s16 *); /* extern */ +void func_800A66A8(struct_8018D9E0_entry *, s16 *); /* extern */ extern s32 D_8018D9C0; -extern ? D_8018EE10; +extern struct_8018EE10_entry D_8018EE10; static s8 *D_800E75C4[0x14] = { "mario raceway", "choco mountain", @@ -9512,7 +9516,7 @@ block_13: arg0->type = 0; return; default: - if ((gModeSelection != 0) || (gPlayerCountSelection1 != 1) || (D_8018EE08 != 0)) { + if ((gModeSelection != GRAND_PRIX) || (gPlayerCountSelection1 != 1) || (D_8018EE08 != 0)) { goto block_13; } temp_t8 = arg0->unk1C - 2; @@ -9532,7 +9536,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A2D1C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_800A32B4(s32, s32, s8, s32); /* extern */ +void func_800A32B4(s32, s32, s8, s32); /* extern */ extern s16 gGPCurrentRacePlayerIdByRank; extern s16 D_80164368; extern ? D_80164370; @@ -9639,7 +9643,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A2EB8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -extern ? gGPCurrentRacePlayerIdByRank; +extern s16 gGPCurrentRacePlayerIdByRank; static s8 *D_800E76A8[9] = { "MARIO", "LUIGI", @@ -9681,9 +9685,9 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A32B4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_800A3A10(s8 *); /* extern */ -? func_800A3ADC(struct_8018D9E0_entry *, s32, s32, s8, s32, s8 *); /* extern */ -extern ? gGPCurrentRacePlayerIdByRank; +void func_800A3A10(s8 *); /* extern */ +void func_800A3ADC(struct_8018D9E0_entry *, s32, s32, s8, s32, s8 *); /* extern */ +extern s16 gGPCurrentRacePlayerIdByRank; extern ? D_80164370; extern ? D_80164478; extern s8 D_8018EDF3; @@ -9977,9 +9981,9 @@ struct _struct_D_800E798C_0x1C { /* 0x04 */ struct _struct_D_800E798C_0x1C unk4; /* inferred */ }; /* size = 0x1C */ -? func_800A66A8(struct_8018D9E0_entry *, s16 *); /* extern */ +void func_800A66A8(struct_8018D9E0_entry *, s16 *); /* extern */ extern s32 D_80162DF8; -extern ? D_8018EE10; +extern struct_8018EE10_entry D_8018EE10; static ? D_800E7390; /* unable to generate initializer; const */ static ? D_800E73C0; /* unable to generate initializer; const */ static ? D_800E73D0; /* unable to generate initializer; const */ @@ -10548,7 +10552,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A4BC8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -extern ? D_8015F480; +extern UnkStruct_800DC5EC D_8015F480; extern s32 gScreenModeSelection; static s8 *D_800E775C[7] = { "CONTINUE GAME", @@ -10604,7 +10608,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A4EF8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -extern ? D_8015F480; +extern UnkStruct_800DC5EC D_8015F480; extern s32 gScreenModeSelection; static s8 *D_800E775C[7] = { "CONTINUE GAME", @@ -10687,7 +10691,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A5084.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -extern ? D_8015F480; +extern UnkStruct_800DC5EC D_8015F480; extern s32 gScreenModeSelection; static s8 *D_800E775C[7] = { "CONTINUE GAME", @@ -10743,10 +10747,10 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A5360.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_800A66A8(struct_8018D9E0_entry *, s16 *); /* extern */ -? guOrtho(Mtx *, f32, ?, ?, f32, f32, f32, f32); /* extern */ +void func_800A66A8(struct_8018D9E0_entry *, s16 *); /* extern */ +void guOrtho(Mtx *, f32, ?, ?, f32, f32, f32, f32); /* extern */ extern s32 gScreenModeSelection; -static ? D_800E8538; /* unable to generate initializer; const */ +static s16 D_800E8538; /* unable to generate initializer; const */ static ? D_800E8540; /* unable to generate initializer; const */ static ? D_800E85C0; /* unable to generate initializer; const */ static ? D_800E8600; /* unable to generate initializer; const */ @@ -10781,16 +10785,16 @@ void func_800A54EC(void) { default: phi_v1 = sp4C; break; - case 1: + case TIME_TRIALS: phi_v1 = &D_800E8538; break; - case 2: + case VERSUS: phi_v1 = ((gScreenModeSelection << 5) + (D_800DC5FC * 8)) - 8 + &D_800E8540; break; - case 0: + case GRAND_PRIX: phi_v1 = ((gScreenModeSelection << 5) + (D_800DC5FC * 8)) - 8 + &D_800E85C0; break; - case 3: + case BATTLE: phi_v1 = ((gScreenModeSelection << 5) + (D_800DC5FC * 8)) - 8 + &D_800E8600; break; } @@ -10813,8 +10817,8 @@ struct _struct_D_800E798C_0x1C { /* 0x18 */ char pad18[4]; }; /* size = 0x1C */ -? func_800A66A8(struct_8018D9E0_entry *, s16 *); /* extern */ -extern ? D_8018EE10; +void func_800A66A8(struct_8018D9E0_entry *, s16 *); /* extern */ +extern struct_8018EE10_entry D_8018EE10; static ? D_800E73E0; /* unable to generate initializer; const */ static ? D_800E7410; /* unable to generate initializer; const */ static ? D_800E7420; /* unable to generate initializer; const */ @@ -11142,7 +11146,7 @@ void func_800A6034(struct_8018D9E0_entry *arg0) { #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_800A66A8(struct_8018D9E0_entry *, s16 *); /* extern */ +void func_800A66A8(struct_8018D9E0_entry *, s16 *); /* extern */ static ? D_800E775C; /* unable to generate initializer; const */ void func_800A6154(struct_8018D9E0_entry *arg0) { @@ -11206,10 +11210,10 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A6154.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_800A66A8(struct_8018D9E0_entry *, void *); /* extern */ -? func_800A69C8(struct_8018D9E0_entry *, s32); /* extern */ -? func_800A6BEC(struct_8018D9E0_entry *, s32); /* extern */ -? func_800A6CC0(struct_8018D9E0_entry *, s32); /* extern */ +void func_800A66A8(struct_8018D9E0_entry *, void *); /* extern */ +void func_800A69C8(struct_8018D9E0_entry *, s32); /* extern */ +void func_800A6BEC(struct_8018D9E0_entry *, s32); /* extern */ +void func_800A6CC0(struct_8018D9E0_entry *, s32); /* extern */ extern s8 D_8018EDF3; static ? D_800E7360; /* unable to generate initializer; const */ static ? D_800E775C; /* unable to generate initializer; const */ @@ -11291,8 +11295,8 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A638C.s") #ifdef MIPS_TO_C //generated by m2c commit 3b40ab93768f52ac241c5ae84ef58ef6bc4cb1de -? guMtxCatL(Mtx *, Mtx *, Mtx *); /* extern */ -extern ? D_0D003090; +void guMtxCatL(Mtx *, Mtx *, Mtx *); /* extern */ +extern Gfx D_0D003090; extern f32 D_8018ED98; extern f32 D_8018ED9C; extern f32 D_8018EDA0; @@ -11374,7 +11378,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A66A8.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800A79F4(u8, s8 *); /* extern */ +void func_800A79F4(u8, s8 *); /* extern */ extern s32 gNmiUnknown1; extern s32 gNmiUnknown4; extern s32 gPlayerWinningIndex; @@ -11404,13 +11408,13 @@ void func_800A69C8(s32 arg0) { temp_v0 = gModeSelection; var_v1 = 0; switch (temp_v0) { /* irregular */ - case 2: + case VERSUS: if (gPlayerPositions[var_s0] != 0) { var_v1 = 1; } var_s4 = gNmiUnknown1 + var_s0; break; - case 3: + case BATTLE: if (var_s0 != gPlayerWinningIndex) { var_v1 = 1; } @@ -11441,8 +11445,8 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A69C8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800A6D94(s32, s32, s32); // extern -? func_800A6E94(s32, s32, s32); // extern +void func_800A6D94(s32, s32, s32); // extern +void func_800A6E94(s32, s32, s32); // extern extern s32 gNmiUnknown2; extern s32 gNmiUnknown5; @@ -11482,8 +11486,8 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A6BEC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307 -? func_800A6D94(?, s32, s32); // extern -? func_800A6E94(?, s32, s32); // extern +void func_800A6D94(?, s32, s32); // extern +void func_800A6E94(?, s32, s32); // extern extern s32 gNmiUnknown3; extern s32 gNmiUnknown6; @@ -11523,7 +11527,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A6CC0.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800A79F4(s32, s8 *); /* extern */ +void func_800A79F4(s32, s8 *); /* extern */ extern s32 gPlayerWinningIndex; static ? D_800E7300; /* unable to generate initializer */ @@ -11702,7 +11706,7 @@ void func_800A75A0(struct_8018D9E0_entry *arg0) { #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800A79F4(s32, s8 *); /* extern */ +void func_800A79F4(s32, s8 *); /* extern */ static s8 *D_800E7AA4[9] = { "YOU PLACED", " st", @@ -11835,56 +11839,56 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A79F4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 054f217e0ef630f2a2a76ec70a84ce37369571c0 -? func_8009E000(?); /* extern */ -? func_8009F5E0(struct_8018D9E0_entry *); /* extern */ -? func_800A9710(struct_8018D9E0_entry *); /* extern */ -? func_800A97BC(struct_8018D9E0_entry *); /* extern */ -? func_800A9A98(struct_8018D9E0_entry *); /* extern */ -? func_800A9B9C(struct_8018D9E0_entry *); /* extern */ -? func_800A9C40(struct_8018D9E0_entry *); /* extern */ -? func_800A9D5C(struct_8018D9E0_entry *); /* extern */ -? func_800A9E58(struct_8018D9E0_entry *); /* extern */ -? func_800AA280(struct_8018D9E0_entry *); /* extern */ -? func_800AA2EC(struct_8018D9E0_entry *); /* extern */ -? func_800AA69C(struct_8018D9E0_entry *); /* extern */ -? func_800AAA9C(struct_8018D9E0_entry *); /* extern */ -? func_800AAB90(struct_8018D9E0_entry *); /* extern */ -? func_800AAC18(struct_8018D9E0_entry *); /* extern */ -? func_800AB020(struct_8018D9E0_entry *); /* extern */ -? func_800AB098(struct_8018D9E0_entry *); /* extern */ -? func_800AB164(struct_8018D9E0_entry *); /* extern */ -? func_800AB260(struct_8018D9E0_entry *); /* extern */ -? func_800AB314(struct_8018D9E0_entry *); /* extern */ -? func_800AB904(struct_8018D9E0_entry *); /* extern */ -? func_800AB9B0(struct_8018D9E0_entry *); /* extern */ -? func_800ABAE8(struct_8018D9E0_entry *); /* extern */ -? func_800ABB24(struct_8018D9E0_entry *); /* extern */ -? func_800ABBCC(struct_8018D9E0_entry *); /* extern */ -? func_800ABC38(struct_8018D9E0_entry *); /* extern */ -? func_800ABEAC(struct_8018D9E0_entry *); /* extern */ -? func_800AC300(struct_8018D9E0_entry *); /* extern */ -? func_800AC324(struct_8018D9E0_entry *); /* extern */ -? func_800AC458(struct_8018D9E0_entry *); /* extern */ -? func_800ACA14(struct_8018D9E0_entry *); /* extern */ -? func_800ACC50(struct_8018D9E0_entry *); /* extern */ -? func_800ACF40(struct_8018D9E0_entry *); /* extern */ -? func_800AD1A4(struct_8018D9E0_entry *); /* extern */ -? func_800AD2E8(struct_8018D9E0_entry *); /* extern */ -? func_800ADF48(struct_8018D9E0_entry *); /* extern */ -? func_800AE218(struct_8018D9E0_entry *); /* extern */ -? func_800AEC54(struct_8018D9E0_entry *); /* extern */ -? func_800AEDBC(struct_8018D9E0_entry *); /* extern */ -? func_800AEE90(struct_8018D9E0_entry *); /* extern */ -? func_800AEEBC(struct_8018D9E0_entry *); /* extern */ -? func_800AEEE8(struct_8018D9E0_entry *); /* extern */ -? func_800AEF14(struct_8018D9E0_entry *); /* extern */ -? func_800AEF74(struct_8018D9E0_entry *); /* extern */ -? func_800AF004(struct_8018D9E0_entry *); /* extern */ -? func_800AF1AC(struct_8018D9E0_entry *); /* extern */ -? func_800AF270(struct_8018D9E0_entry *); /* extern */ -? func_800AF480(struct_8018D9E0_entry *); /* extern */ -? func_800CA388(?); /* extern */ -? play_sound2(?); /* extern */ +void func_8009E000(?); /* extern */ +void func_8009F5E0(struct_8018D9E0_entry *); /* extern */ +void func_800A9710(struct_8018D9E0_entry *); /* extern */ +void func_800A97BC(struct_8018D9E0_entry *); /* extern */ +void func_800A9A98(struct_8018D9E0_entry *); /* extern */ +void func_800A9B9C(struct_8018D9E0_entry *); /* extern */ +void func_800A9C40(struct_8018D9E0_entry *); /* extern */ +void func_800A9D5C(struct_8018D9E0_entry *); /* extern */ +void func_800A9E58(struct_8018D9E0_entry *); /* extern */ +void func_800AA280(struct_8018D9E0_entry *); /* extern */ +void func_800AA2EC(struct_8018D9E0_entry *); /* extern */ +void func_800AA69C(struct_8018D9E0_entry *); /* extern */ +void func_800AAA9C(struct_8018D9E0_entry *); /* extern */ +void func_800AAB90(struct_8018D9E0_entry *); /* extern */ +void func_800AAC18(struct_8018D9E0_entry *); /* extern */ +void func_800AB020(struct_8018D9E0_entry *); /* extern */ +void func_800AB098(struct_8018D9E0_entry *); /* extern */ +void func_800AB164(struct_8018D9E0_entry *); /* extern */ +void func_800AB260(struct_8018D9E0_entry *); /* extern */ +void func_800AB314(struct_8018D9E0_entry *); /* extern */ +void func_800AB904(struct_8018D9E0_entry *); /* extern */ +void func_800AB9B0(struct_8018D9E0_entry *); /* extern */ +void func_800ABAE8(struct_8018D9E0_entry *); /* extern */ +void func_800ABB24(struct_8018D9E0_entry *); /* extern */ +void func_800ABBCC(struct_8018D9E0_entry *); /* extern */ +void func_800ABC38(struct_8018D9E0_entry *); /* extern */ +void func_800ABEAC(struct_8018D9E0_entry *); /* extern */ +void func_800AC300(struct_8018D9E0_entry *); /* extern */ +void func_800AC324(struct_8018D9E0_entry *); /* extern */ +void func_800AC458(struct_8018D9E0_entry *); /* extern */ +void func_800ACA14(struct_8018D9E0_entry *); /* extern */ +void func_800ACC50(struct_8018D9E0_entry *); /* extern */ +void func_800ACF40(struct_8018D9E0_entry *); /* extern */ +void func_800AD1A4(struct_8018D9E0_entry *); /* extern */ +void func_800AD2E8(struct_8018D9E0_entry *); /* extern */ +void func_800ADF48(struct_8018D9E0_entry *); /* extern */ +void func_800AE218(struct_8018D9E0_entry *); /* extern */ +void func_800AEC54(struct_8018D9E0_entry *); /* extern */ +void func_800AEDBC(struct_8018D9E0_entry *); /* extern */ +void func_800AEE90(struct_8018D9E0_entry *); /* extern */ +void func_800AEEBC(struct_8018D9E0_entry *); /* extern */ +void func_800AEEE8(struct_8018D9E0_entry *); /* extern */ +void func_800AEF14(struct_8018D9E0_entry *); /* extern */ +void func_800AEF74(struct_8018D9E0_entry *); /* extern */ +void func_800AF004(struct_8018D9E0_entry *); /* extern */ +void func_800AF1AC(struct_8018D9E0_entry *); /* extern */ +void func_800AF270(struct_8018D9E0_entry *); /* extern */ +void func_800AF480(struct_8018D9E0_entry *); /* extern */ +void func_800CA388(?); /* extern */ +void play_sound2(?); /* extern */ extern s32 D_8018ED94; extern s32 D_8018EDE0; extern s8 D_8018EDEE; @@ -11992,18 +11996,17 @@ block_7: break; case 0x10: /* switch 8 */ case 0x11: /* switch 8 */ - temp_t9 = gMainMenuSelectionDepth; - switch (temp_t9) { /* switch 5 */ - case 1: /* switch 5 */ - case 2: /* switch 5 */ - case 3: /* switch 5 */ + switch (gMainMenuSelectionDepth) { /* switch 5 */ + case OPTIONS_SELECTION: /* switch 5 */ + case DATA_SELECTION: /* switch 5 */ + case PLAYER_NUM_SELECTION: /* switch 5 */ func_800A9B9C(phi_s1); break; - case 4: /* switch 5 */ - case 5: /* switch 5 */ - case 6: /* switch 5 */ - case 7: /* switch 5 */ - case 8: /* switch 5 */ + case GAME_MODE_SELECTION: /* switch 5 */ + case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION: /* switch 5 */ + case CONFIRM_OK_SELECTION: /* switch 5 */ + case CONFIRM_OK_SELECTION_FROM_BACK_OUT: /* switch 5 */ + case TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT: /* switch 5 */ func_800A9C40(phi_s1); break; } @@ -12016,18 +12019,17 @@ block_7: case 0xC: /* switch 8 */ case 0xD: /* switch 8 */ case 0xE: /* switch 8 */ - temp_t1 = gMainMenuSelectionDepth; - switch (temp_t1) { /* switch 6 */ - case 1: /* switch 6 */ - case 2: /* switch 6 */ - case 3: /* switch 6 */ + switch (gMainMenuSelectionDepth) { /* switch 6 */ + case OPTIONS_SELECTION: /* switch 6 */ + case DATA_SELECTION: /* switch 6 */ + case PLAYER_NUM_SELECTION: /* switch 6 */ func_800A9B9C(phi_s1); break; - case 4: /* switch 6 */ - case 5: /* switch 6 */ - case 6: /* switch 6 */ - case 7: /* switch 6 */ - case 8: /* switch 6 */ + case GAME_MODE_SELECTION: /* switch 6 */ + case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION: /* switch 6 */ + case CONFIRM_OK_SELECTION: /* switch 6 */ + case CONFIRM_OK_SELECTION_FROM_BACK_OUT: /* switch 6 */ + case TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT: /* switch 6 */ func_800A9C40(phi_s1); break; } @@ -12343,8 +12345,8 @@ void func_800A8250(void) { //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda extern s8 D_8018EDF3; extern s8 gMainMenuSelectionDepth; -static ? D_800E86AC; /* unable to generate initializer; const */ -static ? D_800F2B60; /* unable to generate initializer; const */ +static s8 D_800E86AC; /* unable to generate initializer; const */ +static s8 D_800F2B60; /* unable to generate initializer; const */ void func_800A8270(s32 arg0, struct_8018D9E0_entry *arg1) { Gfx *temp_v0; @@ -12394,7 +12396,7 @@ void func_800A8270(s32 arg0, struct_8018D9E0_entry *arg1) { temp_v0_4 = gMainMenuSelectionDepth; temp_s3_2 = temp_t1 + temp_t6; phi_s3 = temp_s3_2; - if ((temp_v0_4 == 1) || (temp_v0_4 == 2) || (temp_v0_4 == 3)) { + if ((temp_v0_4 == OPTIONS_SELECTION) || (temp_v0_4 == DATA_SELECTION) || (temp_v0_4 == PLAYER_NUM_SELECTION)) { temp_s4 = (temp_t1 - temp_t6) + 0x3F; phi_v0 = func_800959A0(gDisplayListHead, temp_s3_2, temp_s0, temp_s4, temp_s0 + 0x35); phi_s4 = temp_s4; @@ -12417,7 +12419,7 @@ void func_800A8270(s32 arg0, struct_8018D9E0_entry *arg1) { if ((s32) *temp_s7 >= 0) { do { if ((phi_s2 == *(arg0 + &D_800E86AC)) && ((arg0 + 1) == D_8018EDF3) && (temp_v0_5 = gMainMenuSelectionDepth, (((s32) temp_v0_5 < 4) == 0))) { - if (temp_v0_5 == 4) { + if (temp_v0_5 == GAME_MODE_SELECTION) { phi_v0_2 = func_800959A0(gDisplayListHead, phi_s3, phi_s0, phi_s4, phi_s0 + 0x11); } else { phi_v0_2 = func_80098C18(gDisplayListHead, phi_s3, phi_s0, phi_s4, phi_s0 + 0x11, 0xFF, 0xF9, 0xDC, 0xFF); @@ -12463,7 +12465,7 @@ void func_800A8564(struct_8018D9E0_entry *arg0) { temp_v0_2 = gMainMenuSelectionDepth; phi_a0 = D_0200487C; phi_a0 = D_0200487C; - if ((temp_v0_2 == 6) || (temp_v0_2 == 7)) { + if ((temp_v0_2 == CONFIRM_OK_SELECTION) || (temp_v0_2 == CONFIRM_OK_SELECTION_FROM_BACK_OUT)) { block_11: phi_a1 = 1; } @@ -12634,7 +12636,7 @@ void func_800A8A98(struct_8018D9E0_entry *arg0) { phi_s4 = 0; phi_s0 = &D_800E7208; do { - if ((phi_s4 == gCupCourseSelection) && (temp_v0_4 = D_8018EDEC, (((s32) temp_v0_4 < 2) == 0)) && (gModeSelection != 0)) { + if ((phi_s4 == gCupCourseSelection) && (temp_v0_4 = D_8018EDEC, (((s32) temp_v0_4 < 2) == 0)) && (gModeSelection != GRAND_PRIX)) { if ((temp_v0_4 == 2) || (temp_v0_4 == 4)) { phi_v0 = func_800959A0(gDisplayListHead, phi_s0->unk0 + temp_s2, phi_s0->unk2 + temp_s3, phi_s0->unk8 + temp_s2, phi_s0->unkA + temp_s3); } else { @@ -12692,7 +12694,7 @@ void func_800A8CA4(struct_8018D9E0_entry *arg0) { gDisplayListHead = temp_v1_3 + 8; temp_v1_3->words.w0 = 0xFCFFFFFF; temp_v1_3->words.w1 = 0xFFFCF279; - if (gModeSelection == 0) { + if (gModeSelection == GRAND_PRIX) { phi_s0 = 0; if (D_8018EDEC != 3) { do { @@ -13007,7 +13009,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A9710.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -static ? D_800E86C4; /* unable to generate initializer; const */ +static s8 D_800E86C4; /* unable to generate initializer; const */ static ? (D_800E86C4 + 2); /* unable to generate initializer; const */ static ? ((D_800E86C4 + 2) + 1); /* unable to generate initializer; const */ static ? ((D_800E86C4 + 2) + 2); /* unable to generate initializer; const */ @@ -13219,7 +13221,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A9A98.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_800AA280(); /* extern */ +void func_800AA280(); /* extern */ void func_800A9B9C(struct_8018D9E0_entry *arg0) { s32 temp_t0; @@ -13261,7 +13263,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A9B9C.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_800AA280(); /* extern */ +void func_800AA280(); /* extern */ extern s8 D_8018EDF3; extern s8 gMainMenuSelectionDepth; @@ -13291,7 +13293,7 @@ void func_800A9C40(struct_8018D9E0_entry *arg0) { case 1: func_800AA280(); temp_v0 = gMainMenuSelectionDepth; - if ((temp_v0 == 7) || (temp_v0 == 8)) { + if ((temp_v0 == CONFIRM_OK_SELECTION_FROM_BACK_OUT) || (temp_v0 == TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT)) { arg0->unk1C = 0x20; return; } @@ -13337,7 +13339,7 @@ void func_800A9D5C(struct_8018D9E0_entry *arg0) { switch (temp_t1) { case 2: temp_v0 = gMainMenuSelectionDepth; - if ((temp_v0 == 7) || (temp_v0 == 8)) { + if ((temp_v0 == CONFIRM_OK_SELECTION_FROM_BACK_OUT) || (temp_v0 == TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT)) { arg0->column = 0x00000080; arg0->row = 0x0000003E; return; @@ -13365,8 +13367,8 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A9D5C.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -extern ? D_800E86AC; -extern ? gGameModeFromNumPlayersAndRowSelection; +extern s8 D_800E86AC; +extern s32 gGameModeFromNumPlayersAndRowSelection; extern s8 gMainMenuSelectionDepth; static ? D_800E70E8; /* unable to generate initializer */ @@ -13432,11 +13434,10 @@ block_5: return; } arg0->unk20 = (s32) temp_a2; - temp_t5 = gMainMenuSelectionDepth; - switch (temp_t5) { /* switch 2 */ - case 4: /* switch 2 */ - case 5: /* switch 2 */ - case 6: /* switch 2 */ + switch (gMainMenuSelectionDepth) { /* switch 2 */ + case GAME_MODE_SELECTION: /* switch 2 */ + case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION: /* switch 2 */ + case CONFIRM_OK_SELECTION: /* switch 2 */ arg0->visible = 1; temp_v0_2 = func_800AAE68(temp_a1, temp_a2, sp20); arg0->column = temp_v0_2->column; @@ -13444,8 +13445,8 @@ block_5: arg0->unk4 = 1; arg0->row = (*(&D_800E86AC - 1 + D_8018EDF3) * 0x12) + temp_v0_2->row + 0x41; return; - case 7: /* switch 2 */ - case 8: /* switch 2 */ + case CONFIRM_OK_SELECTION_FROM_BACK_OUT: /* switch 2 */ + case TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT: /* switch 2 */ temp_v0_3 = func_800AAE68(temp_a1, temp_a2, sp20); temp_v1_2 = (arg0->type * 8) + -(sp24 * 8) + &D_800E70E8; arg0->column = temp_v0_3->column + temp_v1_2->unk0; @@ -13461,13 +13462,12 @@ block_5: } break; case 1: /* switch 5 */ - temp_t2 = gMainMenuSelectionDepth; - switch (temp_t2) { /* switch 3 */ - case 4: /* switch 3 */ - case 5: /* switch 3 */ - case 6: /* switch 3 */ - case 7: /* switch 3 */ - case 8: /* switch 3 */ + switch (gMainMenuSelectionDepth) { /* switch 3 */ + case GAME_MODE_SELECTION: /* switch 3 */ + case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION: /* switch 3 */ + case CONFIRM_OK_SELECTION: /* switch 3 */ + case CONFIRM_OK_SELECTION_FROM_BACK_OUT: /* switch 3 */ + case TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT: /* switch 3 */ if ((temp_a1 != sp20) && (temp_a1 != sp1C)) { arg0->visible = 0; block_37: @@ -13498,13 +13498,12 @@ block_37: } break; case 2: /* switch 5 */ - temp_t9 = gMainMenuSelectionDepth; - switch (temp_t9) { /* switch 4 */ - case 4: /* switch 4 */ - case 5: /* switch 4 */ - case 6: /* switch 4 */ - case 7: /* switch 4 */ - case 8: /* switch 4 */ + switch (gMainMenuSelectionDepth) { /* switch 4 */ + case GAME_MODE_SELECTION: /* switch 4 */ + case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION: /* switch 4 */ + case CONFIRM_OK_SELECTION: /* switch 4 */ + case CONFIRM_OK_SELECTION_FROM_BACK_OUT: /* switch 4 */ + case TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT: /* switch 4 */ if ((temp_a1 != sp20) && (temp_a1 != sp1C)) { arg0->visible = 0; goto block_37; @@ -13543,7 +13542,7 @@ void func_800AA280(struct_8018D9E0_entry *arg0) { temp_v1 = gMainMenuSelectionDepth; temp_v0 = (arg0->type * 8) - 0x50 + &D_800E70A0; - if ((temp_v1 == 7) || (temp_v1 == 8)) { + if ((temp_v1 == CONFIRM_OK_SELECTION_FROM_BACK_OUT) || (temp_v1 == TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT)) { arg0->column = (s32) temp_v0->unk0; arg0->row = (s32) temp_v0->unk2; return; @@ -13557,7 +13556,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AA280.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc s32 check_for_controller_pak(?); /* extern */ -extern ? D_800E86AC; +extern s8 D_800E86AC; extern u16 D_800E86F0; extern u32 D_800E86F4; extern s8 D_800E86F8; @@ -13580,16 +13579,16 @@ void func_800AA2EC(struct_8018D9E0_entry *arg0) { temp_t6 = gMainMenuSelectionDepth; var_t1 = 0; switch (temp_t6) { - case 1: - case 2: - case 3: - case 4: + case OPTIONS_SELECTION: + case DATA_SELECTION: + case PLAYER_NUM_SELECTION: + case GAME_MODE_SELECTION: arg0->unk4 = 0; return; - case 5: - case 6: - case 7: - case 8: + case GAME_MODE_CC_OR_TIME_TRIALS_OPTIONS_SELECTION: + case CONFIRM_OK_SELECTION: + case CONFIRM_OK_SELECTION_FROM_BACK_OUT: + case TIME_TRAILS_DATA_SELECTION_FROM_BACK_OUT: if ((arg0->unk4 == 0) && (temp_v0 = D_8018EDF3, (temp_v0 == 1)) && (*(&D_800E86AC - 1 + temp_v0) == 1)) { if (D_800E86F8 != 0) { sp20 = 0; @@ -13678,7 +13677,9 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AA2EC.s") s32 func_800AAFCC(s32); /* extern */ s32 random_int(?, s32); /* extern */ extern ? D_8018DEE4; -extern ? D_8018EDE8; +extern s8 D_8018EDE8; + +// head selection static MkAnimation *D_800E8360[8] = { D_02006708, D_020068F0, @@ -13689,6 +13690,7 @@ static MkAnimation *D_800E8360[8] = { D_02007468, D_02006AD8, }; /* const */ + static MkAnimation *gCharacterCelebrateAnimation[8] = { D_02006718, D_02006900, @@ -13699,6 +13701,8 @@ static MkAnimation *gCharacterCelebrateAnimation[8] = { D_02007478, D_02006AE8, }; /* const */ + +// celebrate end static MkAnimation *D_800E83A0[8] = { D_02006778, D_02006960, @@ -13709,6 +13713,7 @@ static MkAnimation *D_800E83A0[8] = { D_020074D8, D_02006B48, }; /* const */ + static MkAnimation *gCharacterDeselectAnimation[8] = { D_02006788, D_02006970, @@ -13719,6 +13724,7 @@ static MkAnimation *gCharacterDeselectAnimation[8] = { D_020074E8, D_02006B58, }; /* const */ + static MkAnimation *gCharacterSingleBlinkAnimation[8] = { D_020067E0, D_020069C8, @@ -13727,8 +13733,9 @@ static MkAnimation *gCharacterSingleBlinkAnimation[8] = { D_02007170, D_02007358, D_02007540, - D_02006BB0, + D_02006CB0, }; /* const */ + static MkAnimation *gCharacterDoubleBlinkAnimation[8] = { D_02006838, D_02006A20, @@ -13739,6 +13746,17 @@ static MkAnimation *gCharacterDoubleBlinkAnimation[8] = { D_02007598, D_02006C08, }; /* const */ + +static MkAnimation *D_800E8420[8] = { + D_020067E0, + D_020069C8, + D_02006D98, + D_02006F80, + D_02007170, + D_02007358, + D_02007540, + D_02006CB0, +}; /* const */ static s32 D_800E8440[8] = { 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA, 0xA }; /* const */ static s32 D_800E8460[8] = { 9, 9, 9, 9, 0xA, 9, 9, 9 }; /* const */ static s32 D_800E8480[8] = { 9, 9, 9, 9, 9, 9, 9, 9 }; /* const */ @@ -13957,7 +13975,7 @@ struct _struct_D_800E7108_0x8 { /* 0x4 */ char pad4[4]; /* maybe part of unk2[3]? */ }; /* size = 0x8 */ -? func_800A91D8(struct_8018D9E0_entry *, s16, s16, struct_8018D9E0_entry *); /* extern */ +void func_800A91D8(struct_8018D9E0_entry *, s16, s16, struct_8018D9E0_entry *); /* extern */ s32 func_800AAFCC(s32, s32, s32, struct_8018D9E0_entry *); /* extern */ extern s8 D_8018EDEE; extern s32 gScreenModeSelection; @@ -14368,7 +14386,7 @@ void func_800AB314(struct_8018D9E0_entry *arg0) { var_v1 += 4; var_v1->unk-4 = temp_v0; } while (var_a1 < 4); - if (gModeSelection != 0) { + if (gModeSelection != GRAND_PRIX) { if (D_8018EDEC != 1) { arg0->unk4 = 0; arg0->unk20 = 0; @@ -14592,7 +14610,7 @@ struct _struct_D_800E7268_0x8 { /* 0x4 */ char pad4[4]; /* maybe part of unk2[3]? */ }; /* size = 0x8 */ -? func_800A91D8(struct_8018D9E0_entry *, s16, s16); /* extern */ +void func_800A91D8(struct_8018D9E0_entry *, s16, s16); /* extern */ static struct _struct_D_800E7268_0x8 D_800E7268[0]; /* unable to generate initializer; const */ static ? D_800E7E20; /* unable to generate initializer; const */ @@ -14717,7 +14735,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800ABBCC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_800ABCF4(); /* extern */ +void func_800ABCF4(); /* extern */ extern s8 D_8018EE08; void func_800ABC38(struct_8018D9E0_entry *arg0) { @@ -14741,7 +14759,7 @@ block_13: arg0->type = 0; return; default: - if ((gModeSelection != 0) || (gPlayerCountSelection1 != 1U) || (D_8018EE08 != 0)) { + if ((gModeSelection != GRAND_PRIX) || (gPlayerCountSelection1 != 1U) || (D_8018EE08 != 0)) { goto block_13; } temp_v0_3 = arg0->row; @@ -14816,7 +14834,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800ABCF4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_800ABF68(); /* extern */ +void func_800ABF68(); /* extern */ extern s8 D_8018EE08; void func_800ABEAC(struct_8018D9E0_entry *arg0) { @@ -14840,7 +14858,7 @@ block_13: arg0->type = 0; return; default: - if ((gModeSelection != 0) || (gPlayerCountSelection1 != 1U) || (D_8018EE08 != 0)) { + if ((gModeSelection != GRAND_PRIX) || (gPlayerCountSelection1 != 1U) || (D_8018EE08 != 0)) { goto block_13; } temp_v0_3 = arg0->row; @@ -14857,7 +14875,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800ABEAC.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 054f217e0ef630f2a2a76ec70a84ce37369571c0 -? func_800A9208(struct_8018D9E0_entry *, s32); /* extern */ +void func_800A9208(struct_8018D9E0_entry *, s32); /* extern */ s16 gCurrentCourseId; /* unable to generate initializer */ s8 *D_800E7524[0x14] = { "mario raceway", @@ -14934,7 +14952,7 @@ void func_800AC300(struct_8018D9E0_entry *arg0) { #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_800A9208(struct_8018D9E0_entry *, ?); /* extern */ +void func_800A9208(struct_8018D9E0_entry *, ?); /* extern */ extern s8 D_8018D9D8; static s32 D_800DDB24 = 1; @@ -14989,13 +15007,13 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AC324.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_800B536C(s32, s32, s32, struct_8018D9E0_entry *); /* extern */ -? func_800CA330(?, s32); /* extern */ -? play_sound2(?, s32, u8 *, struct_8018D9E0_entry *); /* extern */ +void func_800B536C(s32, s32, s32, struct_8018D9E0_entry *); /* extern */ +void func_800CA330(?, s32); /* extern */ +void play_sound2(?, s32, u8 *, struct_8018D9E0_entry *); /* extern */ extern void *D_800DC5EC; extern void *D_800DC5F0; extern s16 D_8015F894; -extern ? gGPCurrentRacePlayerIdByRank; +extern s16 gGPCurrentRacePlayerIdByRank; extern ? D_80164478; extern void *D_8018D9BC; extern s8 D_8018D9D8; @@ -15241,9 +15259,9 @@ void func_800AC978(struct_8018D9E0_entry *arg0) { #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_8009DFE0(?, struct_8018D9E0_entry *); /* extern */ -? func_800CA330(?); /* extern */ -? play_sound2(?, struct_8018D9E0_entry *); /* extern */ +void func_8009DFE0(?, struct_8018D9E0_entry *); /* extern */ +void func_800CA330(?); /* extern */ +void play_sound2(?, struct_8018D9E0_entry *); /* extern */ extern void *gControllerFive; void func_800ACA14(struct_8018D9E0_entry *arg0) { @@ -15361,8 +15379,8 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800ACA14.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_8009DFE0(?, struct_8018D9E0_entry *); /* extern */ -? play_sound2(?, struct_8018D9E0_entry *); /* extern */ +void func_8009DFE0(?, struct_8018D9E0_entry *); /* extern */ +void play_sound2(?, struct_8018D9E0_entry *); /* extern */ extern s8 D_8018EDF3; extern s8 D_8018EDF4; extern s8 D_8018EDF6; @@ -15423,7 +15441,7 @@ void func_800ACC50(struct_8018D9E0_entry *arg0) { temp_t9 = temp_a1->unk1C + 0x20; temp_a1->unk1C = temp_t9; if (temp_t9 >= 0x100) { - if (gModeSelection == 2) { + if (gModeSelection == VERSUS) { temp_a1->unk4 = (s32) D_8018EDF4; } else { temp_a1->unk4 = (s32) D_8018EDF6; @@ -15483,7 +15501,7 @@ void func_800ACC50(struct_8018D9E0_entry *arg0) { arg0 = phi_a1_2; func_8009DFE0(0x1E, phi_a1_2); play_sound2(0x49008016); - if (gModeSelection == 2) { + if (gModeSelection == VERSUS) { D_8018EDF4 = (s8) arg0->unk4; } else { D_8018EDF6 = (s8) arg0->unk4; @@ -15503,7 +15521,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800ACC50.s") #ifdef MIPS_TO_C //generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc -? func_800CA24C(s32); /* extern */ +void func_800CA24C(s32); /* extern */ extern ? D_8018DEE4; extern s32 gPlayerWinningIndex; static ? D_800E72F8; /* unable to generate initializer */ @@ -15582,13 +15600,13 @@ void func_800ACF40(struct_8018D9E0_entry *arg0) { temp_v0_3 = gModeSelection; var_v1 = 0; switch (temp_v0_3) { /* switch 1; irregular */ - case 2: /* switch 1 */ + case VERSUS: /* switch 1 */ if (gPlayerPositions[temp_a2] != 0) { block_11: var_v1 = 1; } break; - case 3: /* switch 1 */ + case BATTLE: /* switch 1 */ if (temp_a2 != gPlayerWinningIndex) { goto block_11; } @@ -15628,7 +15646,7 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800ACF40.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_800A9208(struct_8018D9E0_entry *, ?); /* extern */ +void func_800A9208(struct_8018D9E0_entry *, ?); /* extern */ extern s8 D_8018D9D8; void func_800AD1A4(struct_8018D9E0_entry *arg0) { @@ -15692,25 +15710,25 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AD1A4.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda s32 func_800B6348(s32); /* extern */ -? func_800B6708(); /* extern */ +void func_800B6708(); /* extern */ s32 osPfsFindFile(? *, u16, s32, ? *, ? *, ? *); /* extern */ -? play_sound2(?, u16); /* extern */ +void play_sound2(?, u16); /* extern */ extern void *D_800DC5EC; extern void *D_800DC5F0; extern s32 D_80162DF8; extern void *D_8018D9BC; extern s8 D_8018D9D8; -extern ? D_8018E868; +extern OSPfs D_8018E868; extern s32 D_8018EB78; extern s32 D_8018EB7C; -extern ? D_8018EB84; +extern s32 D_8018EB84; extern s8 D_8018EDF5; extern void *gControllerOne; static u16 D_800E86F0; /* unable to generate initializer; const */ static s32 D_800E86F4 = 0x4E4B544A; /* const */ static s8 D_800E86F8 = 0; /* const */ -static ? D_800F2E64; /* unable to generate initializer; const */ -static ? D_800F2E74; /* unable to generate initializer; const */ +static u8 D_800F2E64; /* unable to generate initializer; const */ +static u8 D_800F2E74; /* unable to generate initializer; const */ static s8 gGP1stPlaceReward = 9; /* const */ static s8 gGP2ndPlaceReward = 6; /* const */ static s8 gGP3rdPlaceReward = 3; /* const */ @@ -15949,11 +15967,11 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AD2E8.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_8009DFE0(?, struct_8018D9E0_entry *, void *, s32 *); /* extern */ -? func_800C9F90(?); /* extern */ -? func_800CA330(?); /* extern */ -? func_8028DF38(?, struct_8018D9E0_entry *, void *, s32 *); /* extern */ -extern ? gControllers; +void func_8009DFE0(?, struct_8018D9E0_entry *, void *, s32 *); /* extern */ +void func_800C9F90(?); /* extern */ +void func_800CA330(?); /* extern */ +void func_8028DF38(?, struct_8018D9E0_entry *, void *, s32 *); /* extern */ +extern Controller gControllers; static ? D_800F0B50; /* unable to generate initializer; const */ static ? D_800F0B54; /* unable to generate initializer; const */ @@ -16080,28 +16098,28 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800ADF48.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_8009DFE0(?); /* extern */ +void func_8009DFE0(?); /* extern */ s32 func_800B6178(s32); /* extern */ s32 func_800B6348(s32); /* extern */ s32 func_800B63F0(s32); /* extern */ -? func_800B6708(); /* extern */ -? func_800CA330(?); /* extern */ -? func_800CA388(?); /* extern */ +void func_800B6708(); /* extern */ +void func_800CA330(?); /* extern */ +void func_800CA388(?); /* extern */ s32 osPfsFindFile(? *, u16, s32, ? *, ? *, ? *); /* extern */ -? play_sound2(?, s32); /* extern */ +void play_sound2(?, s32); /* extern */ extern s8 D_8018CAE0; -extern ? D_8018E868; +extern OSPfs D_8018E868; extern s32 D_8018EB78; extern s32 D_8018EB7C; -extern ? D_8018EB84; -extern ? D_8018EE10; +extern s32 D_8018EB84; +extern struct_8018EE10_entry D_8018EE10; extern void *gControllerOne; static s16 D_800DC5B8; /* unable to generate initializer */ static u16 D_800E86F0; /* unable to generate initializer; const */ static s32 D_800E86F4 = 0x4E4B544A; /* const */ static s8 D_800E86F8 = 0; /* const */ -static ? D_800F2E64; /* unable to generate initializer; const */ -static ? D_800F2E74; /* unable to generate initializer; const */ +static u8 D_800F2E64; /* unable to generate initializer; const */ +static u8 D_800F2E74; /* unable to generate initializer; const */ void func_800AE218(struct_8018D9E0_entry *arg0) { s32 sp28; @@ -16572,8 +16590,8 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AEC54.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda s32 func_800B5B94(); /* extern */ -? func_800B6708(); /* extern */ -extern ? D_8018EE10; +void func_800B6708(); /* extern */ +extern struct_8018EE10_entry D_8018EE10; MkAnimation *D_800E7E34[0x14] = { D_02001E64, D_02001E74, @@ -16702,10 +16720,10 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AEF74.s") #ifdef MIPS_TO_C //generated by mips_to_c commit 06ada559d7a32fdab49fa2d619cdfa027615bcda -? func_8009DFE0(?); /* extern */ -? func_800CA330(?); /* extern */ -? func_800CA388(?); /* extern */ -? play_sound2(?); /* extern */ +void func_8009DFE0(?); /* extern */ +void func_800CA330(?); /* extern */ +void func_800CA388(?); /* extern */ +void play_sound2(?); /* extern */ extern void *gControllerFive; void func_800AF004(struct_8018D9E0_entry *arg0) { @@ -16785,7 +16803,7 @@ struct _struct_D_800E7480_0x8 { /* 0x4 */ char pad4[4]; /* maybe part of unk2[3]? */ }; /* size = 0x8 */ -? func_800A91D8(s16, s16); /* extern */ +void func_800A91D8(s16, s16); /* extern */ static struct _struct_D_800E7458_0x8 D_800E7458[0]; /* unable to generate initializer; const */ static struct _struct_D_800E7480_0x8 D_800E7480[0]; /* unable to generate initializer; const */ @@ -16835,9 +16853,9 @@ struct _struct_D_800E7480_0x8 { /* 0x4 */ char pad4[4]; /* maybe part of unk2[3]? */ }; /* size = 0x8 */ -? func_800A91D8(struct_8018D9E0_entry *, s16, s16); /* extern */ -? func_800C90F4(?, s32); /* extern */ -? func_800CA0A0(); /* extern */ +void func_800A91D8(struct_8018D9E0_entry *, s16, s16); /* extern */ +void func_800C90F4(?, s32); /* extern */ +void func_800CA0A0(); /* extern */ extern ? D_8018DEE4; static struct _struct_D_800E7458_0x8 D_800E7458[0]; /* unable to generate initializer; const */ static struct _struct_D_800E7480_0x8 D_800E7480[0]; /* unable to generate initializer; const */ diff --git a/src/code_800B45E0.c b/src/code_800B45E0.c index d007d7355..3e8a7cdde 100644 --- a/src/code_800B45E0.c +++ b/src/code_800B45E0.c @@ -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) { diff --git a/src/code_80280650.c b/src/code_80280650.c index da2d55141..d8c5c1e6f 100644 --- a/src/code_80280650.c +++ b/src/code_80280650.c @@ -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; diff --git a/src/code_80281FA0.c b/src/code_80281FA0.c index d0ad9db7b..f68465e12 100644 --- a/src/code_80281FA0.c +++ b/src/code_80281FA0.c @@ -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 } }; diff --git a/src/kart_dma.c b/src/kart_dma.c index 88c05294a..8b841d40e 100644 --- a/src/kart_dma.c +++ b/src/kart_dma.c @@ -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); diff --git a/src/main.c b/src/main.c index 2a9c5e6e7..dbd24a10c 100644 --- a/src/main.c +++ b/src/main.c @@ -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: diff --git a/src/math_util.c b/src/math_util.c index 7a0ac30ab..0fc85d44f 100644 --- a/src/math_util.c +++ b/src/math_util.c @@ -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; diff --git a/src/memory.c b/src/memory.c index ea29da12b..a576e7ede 100644 --- a/src/memory.c +++ b/src/memory.c @@ -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; diff --git a/src/menus.c b/src/menus.c index 20b07e8ad..95995ddbf 100644 --- a/src/menus.c +++ b/src/menus.c @@ -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; } diff --git a/src/menus.h b/src/menus.h index 5fb386a4c..8ea82436c 100644 --- a/src/menus.h +++ b/src/menus.h @@ -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]; diff --git a/src/race_logic.c b/src/race_logic.c index 4cb01666c..fc05b4767 100644 --- a/src/race_logic.c +++ b/src/race_logic.c @@ -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); diff --git a/src/render_courses.c b/src/render_courses.c index 2b8ec3f58..6ed37963e 100644 --- a/src/render_courses.c +++ b/src/render_courses.c @@ -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; diff --git a/src/skybox_and_splitscreen.c b/src/skybox_and_splitscreen.c index eb7135bf4..8a7104a4f 100644 --- a/src/skybox_and_splitscreen.c +++ b/src/skybox_and_splitscreen.c @@ -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; diff --git a/src/spawn_players.c b/src/spawn_players.c index a80b62505..76330a953 100644 --- a/src/spawn_players.c +++ b/src/spawn_players.c @@ -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); diff --git a/src/staff_ghosts.c b/src/staff_ghosts.c index 91a7a85a8..ca47b4523 100644 --- a/src/staff_ghosts.c +++ b/src/staff_ghosts.c @@ -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)) { diff --git a/src/textures.inc.c b/src/textures.inc.c index 016306cce..f71a79b27 100644 --- a/src/textures.inc.c +++ b/src/textures.inc.c @@ -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}, diff --git a/tools/actualise_type/main.py b/tools/actualise_type/main.py new file mode 100644 index 000000000..9f1246a93 --- /dev/null +++ b/tools/actualise_type/main.py @@ -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() \ No newline at end of file