mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-08-19 05:22:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Give names to some Grand Prix related variables (#67)

Browse Source 
* Give names to some Grand Prix related variables

Namely variables related to points and standings

Also added some observational comments to a function
or two

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>

* Add defines for character IDs

Signed-off-by: Taggerung <tyler.taggerung@gmail.com>
This commit is contained in:
Tyler McGavran
2021-11-26 19:22:39 -05:00
committed by GitHub
parent 3e0bed79d3
commit 7387724509
21 changed files with 273 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_800393C0.c
+4 -4
View File
@@ -689,13 +689,13 @@ extern f32 D_800EDE58;
extern f32 D_800EDE5C;
void func_8003BE30(void) {
spawn_player(D_800DC4DC, 0, -2770.774f, -345.187f, D_800EDE20, 0.0f, D_8018D9D0[0], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
spawn_player(D_800DC4E0, 1, -3691.506f, -6.822f, D_800EDE24, D_800EDE28, D_8018D9D0[1], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
spawn_player(D_800DC4E4, 2, -3475.028f, -998.485f, D_800EDE2C, D_800EDE30, D_8018D9D0[2], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
spawn_player(D_800DC4DC, 0, -2770.774f, -345.187f, D_800EDE20, 0.0f, gGPOverallRanks[0], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
spawn_player(D_800DC4E0, 1, -3691.506f, -6.822f, D_800EDE24, D_800EDE28, gGPOverallRanks[1], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
spawn_player(D_800DC4E4, 2, -3475.028f, -998.485f, D_800EDE2C, D_800EDE30, gGPOverallRanks[2], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
if (D_802874D8.unk_1D >= 3) {
spawn_player(D_800DC4E8, 3, -3025.772f, 110.039f, D_800EDE34, D_800EDE38, D_802874D8.unk_1E, PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
} else {
spawn_player(D_800DC4E8, 3, -3025.772f, 110.039f, D_800EDE3C, D_800EDE40, D_8018D9D0[3], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
spawn_player(D_800DC4E8, 3, -3025.772f, 110.039f, D_800EDE3C, D_800EDE40, gGPOverallRanks[3], PLAYER_EXISTS | PLAYER_CPU | PLAYER_START_SEQUENCE);
}
spawn_player(D_800DC4EC, 4, -2770.774f, -345.187f, D_800EDE44, 0.0f, 0, 0x7000);
spawn_player(D_800DC4F0, 5, -3691.506f, -6.822f, D_800EDE48, D_800EDE4C, 0, 0x7000);
src/code_800431B0.c
+12 -17
View File
@@ -5991,32 +5991,28 @@ GLOBAL_ASM("asm/non_matchings/code_800431B0/func_8004FDB4.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8004FDB4(f32, f32, s32, s32, s16, s16, s32, s32, s32, s32, s32); // extern
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_8004FDB4(f32, f32, s32, s32, s16, s16, s32, s32, s32, s32, s32); /* extern */
extern ? D_80164360;
extern s8 D_801657E2;
extern ? D_8018CF80;
extern ? D_8018D028;
extern f32 D_8018D050;
extern ? D_8018D078;
extern s32 D_8018D3E0;
extern void *gDisplayListHead;
extern ? lapCount;
void func_80050320(void) {
Gfx *temp_v1_3;
f32 *temp_t0;
f32 *temp_t0_2;
f32 temp_f14;
f32 temp_f14_2;
s16 temp_s0;
s16 temp_s0_2;
s16 temp_v0_2;
s16 temp_v0;
s16 temp_v1;
s16 temp_v1_2;
s32 temp_a1;
s32 temp_a1_2;
s32 temp_v0;
void *temp_v1_3;
f32 *phi_s2;
s32 phi_s1;
s16 phi_s0;
@@ -6032,15 +6028,14 @@ void func_80050320(void) {
phi_s0 = 0;
do {
temp_f14 = *phi_s2;
temp_v0 = phi_s0 * 2;
phi_a0 = 0;
if (temp_f14 >= 0.0f) {
temp_t0 = phi_s1 + &D_8018D028;
if (*(&D_8018D078 + phi_s1) < 0.0) {
phi_a0 = 1;
}
temp_v1 = *(temp_v0 + &D_8018CF80);
temp_a1 = *(&lapCount + (*(temp_v0 + &D_80164360) * 4));
temp_v1 = gGPCurrentRaceRanks[phi_s0];
temp_a1 = lapCount[*((phi_s0 * 2) + &D_80164360)];
if (temp_v1 == D_800DC4DC->characterId) {
func_8004FDB4(*temp_t0, temp_f14, phi_a0, temp_a1, phi_s0, temp_a1, temp_v1, 0xFF, 1, phi_a0, 0);
} else {
@@ -6064,10 +6059,10 @@ void func_80050320(void) {
if (*(&D_8018D078 + phi_s1_2) <= 0.0) {
phi_a0_2 = 1;
}
temp_v0_2 = *((phi_s0_2 * 2) + &D_80164360);
temp_a1_2 = *(&lapCount + (temp_v0_2 * 4));
temp_v1_2 = D_800DC4DC[temp_v0_2].characterId;
if (temp_v0_2 == 0) {
temp_v0 = *((phi_s0_2 * 2) + &D_80164360);
temp_a1_2 = lapCount[temp_v0];
temp_v1_2 = D_800DC4DC[temp_v0].characterId;
if (temp_v0 == 0) {
func_8004FDB4(*temp_t0_2, temp_f14_2, phi_a0_2, temp_a1_2, phi_s0_2, temp_a1_2, temp_v1_2, 0xFF, 1, phi_a0_2, 1);
} else {
func_8004FDB4(*temp_t0_2, temp_f14_2, phi_a0_2, temp_a1_2, phi_s0_2, temp_a1_2, temp_v1_2, 0xFF, 0, phi_a0_2, 1);
@@ -6081,8 +6076,8 @@ void func_80050320(void) {
}
temp_v1_3 = gDisplayListHead;
gDisplayListHead = temp_v1_3 + 8;
temp_v1_3->unk0 = 0xBB000000;
temp_v1_3->unk4 = 0x10001;
temp_v1_3->words.w0 = 0xBB000000;
temp_v1_3->words.w1 = 0x10001;
}
#else
GLOBAL_ASM("asm/non_matchings/code_800431B0/func_80050320.s")
src/code_80057C60.c
+24 -25
View File
@@ -1349,33 +1349,33 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_80059AC8.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8005A3C0(); // extern
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_8005A3C0(); /* extern */
extern s16 D_80164360;
extern ? D_801643B8;
extern ? D_801643D8;
extern ? D_8018CF80;
extern ? D_8018CF90;
extern ? D_8018CF98;
void func_80059C50(void) {
? *temp_v0_2;
? *temp_v1;
s32 *temp_v0_2;
u32 temp_v0;
s16 *phi_a0;
? *phi_v0;
s32 *phi_v0_2;
s16 *phi_v0;
? *phi_v0_2;
? *phi_v1;
func_8005A3C0();
phi_a0 = &D_80164360;
phi_v0 = &D_8018CF80;
phi_v0 = gGPCurrentRaceRanks;
do {
temp_v0 = phi_v0 + 2;
temp_v0->unk-2 = D_800DC4DC[*phi_a0].characterId;
phi_a0 += 2;
phi_v0 = temp_v0;
} while (temp_v0 < &D_8018CF90);
phi_v0_2 = D_801643B8;
phi_v0_2 = &D_801643B8;
phi_v1 = &D_8018CF98;
do {
temp_v0_2 = phi_v0_2 + 0x10;
@@ -1678,11 +1678,10 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005A380.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_8006F824(?, s8, s32); // extern
extern void *D_800DC4C0;
extern void *D_800DC4C4;
extern void *D_800DC4C8;
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_8006F824(?, s8, s32); /* extern */
extern s32 D_800DC50C;
extern u16 D_800DC51C;
extern s8 D_801657E4;
extern s8 D_801657E6;
extern s8 D_801657E8;
@@ -1708,7 +1707,7 @@ void func_8005A3C0(s32 arg2) {
if (temp_v0_2 != 3) {
if (temp_v0_2 != 4) {
phi_a2 = 3;
} else if (((D_800DC4BC->buttonPressed & 1) != 0) || ((D_800DC4C0->unk6 & 1) != 0) || ((D_800DC4C4->unk6 & 1) != 0) || (phi_a2 = 3, ((D_800DC4C8->unk6 & 1) != 0))) {
} else if (((D_800DC4BC->buttonPressed & 1) != 0) || ((D_800DC4C0->buttonPressed & 1) != 0) || ((D_800DC4C4->buttonPressed & 1) != 0) || (phi_a2 = 3, ((D_800DC4C8->buttonPressed & 1) != 0))) {
D_801657E4 = (D_801657E4 + 1) & 1;
D_801657F8 = (D_801657F8 + 1) & 1;
D_80165800.unk0 = (D_80165800.unk0 + 1) & 1;
@@ -1720,7 +1719,7 @@ void func_8005A3C0(s32 arg2) {
phi_a2 = 3;
}
}
} else if (((D_800DC4BC->buttonPressed & 1) != 0) || ((D_800DC4C0->unk6 & 1) != 0) || (phi_a2 = 3, ((D_800DC4C4->unk6 & 1) != 0))) {
} else if (((D_800DC4BC->buttonPressed & 1) != 0) || ((D_800DC4C0->buttonPressed & 1) != 0) || (phi_a2 = 3, ((D_800DC4C4->buttonPressed & 1) != 0))) {
if (gModeSelection != BATTLE) {
D_801657F0 = (D_801657F0 + 1) & 1;
}
@@ -1735,7 +1734,7 @@ void func_8005A3C0(s32 arg2) {
D_80165800.unk0 = (D_80165800.unk0 + 1) & 1;
phi_a1 = 1;
}
if ((D_800DC4C0->unk6 & 1) != 0) {
if ((D_800DC4C0->buttonPressed & 1) != 0) {
D_80165800.unk1 = (D_80165800.unk1 + 1) & 1;
phi_a1 = 1;
}
@@ -1752,7 +1751,7 @@ void func_8005A3C0(s32 arg2) {
}
}
} else if ((D_800DC4BC->buttonPressed & 1) != 0) {
D_801657E4 = D_801657E4 + 1;
D_801657E4 += 1;
if (D_801657E4 >= 3) {
D_801657E4 = 0;
}
@@ -3051,15 +3050,14 @@ GLOBAL_ASM("asm/non_matchings/code_80057C60/func_8005C728.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
extern ? D_800E55D0;
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
extern ? D_80164360;
extern s32 D_801643B8;
extern s32 D_80165590;
extern s16 D_80165794;
extern ? D_8018CF28;
extern ? D_8018CF50;
extern ? D_8018CF60;
extern ? D_8018CF80;
extern ? D_8018CF98;
extern s32 D_8018D314;
extern s32 D_8018D3E4;
@@ -3067,6 +3065,7 @@ extern s32 D_8018D3E8;
extern s32 D_8018D3EC;
extern s32 D_8018D3F4;
extern s32 D_8018D3F8;
static ? D_800E55D0; /* unable to generate initializer; const */
void func_8005C980(void) {
? *temp_t0;
@@ -3090,7 +3089,7 @@ void func_8005C980(void) {
temp_a3 = D_800DC4DC;
temp_a1 = D_80165590;
phi_a0 = D_801643B8;
phi_a0 = &D_801643B8;
phi_v0 = 0;
do {
temp_v1 = *phi_a0;
@@ -3112,23 +3111,23 @@ void func_8005C980(void) {
temp_v0_2 = phi_a0_2->unk0;
phi_t0->unk0 = temp_v0_2;
if (temp_a1 == 0) {
*(&D_8018CF80 + phi_v1) = temp_a3[temp_v0_2].characterId;
*(gGPCurrentRaceRanks + phi_v1) = temp_a3[temp_v0_2].characterId;
}
temp_a2 = phi_a0_2->unk2;
phi_t0->unk2 = temp_a2;
if (temp_a1 == 0) {
(&D_8018CF80 + phi_v1)->unk2 = temp_a3[temp_a2].characterId;
(gGPCurrentRaceRanks + phi_v1)->unk2 = temp_a3[temp_a2].characterId;
}
temp_a2_2 = phi_a0_2->unk4;
phi_t0->unk4 = temp_a2_2;
if (temp_a1 == 0) {
(&D_8018CF80 + phi_v1)->unk4 = temp_a3[temp_a2_2].characterId;
(gGPCurrentRaceRanks + phi_v1)->unk4 = temp_a3[temp_a2_2].characterId;
}
temp_a2_3 = phi_a0_2->unk6;
phi_t0->unk6 = temp_a2_3;
phi_a0_2 += 8;
if (temp_a1 == 0) {
(&D_8018CF80 + phi_v1)->unk6 = temp_a3[temp_a2_3].characterId;
(gGPCurrentRaceRanks + phi_v1)->unk6 = temp_a3[temp_a2_3].characterId;
}
temp_t0 = phi_t0 + 8;
phi_t0 = temp_t0;
src/code_80091750.c
+119 -115
View File
@@ -10772,33 +10772,23 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A32B4.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? draw_text(s32, s32, s32, ?, f32, f32); // extern
s32 func_80093034(s32); // extern
? func_80093324(s32, s32, ? *, ?, f32, f32); // extern
? func_800A3A10(s8 *); // extern
? func_800A3ADC(void *, s32, s32, s8, s32, s8 *); // extern
? func_800A7894(s32, ? *); // extern
? set_text_color(s32); // extern
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? draw_text(s32, s32, s32, ?, f32, f32); /* extern */
s32 func_80093034(s32); /* extern */
? func_80093324(s32, s32, ? *, ?, f32, f32); /* extern */
? func_800A3A10(s8 *); /* extern */
? func_800A3ADC(void *, s32, s32, s8, s32, s8 *); /* extern */
? func_800A7894(s32, ? *); /* extern */
? set_text_color(s32); /* extern */
extern s32 D_800DC540;
extern ? D_800E7500;
extern ? D_800E76CC;
extern ? D_800E86AB;
extern ? D_800E86AD;
extern ? D_800F0C34;
extern ? D_800F0C44;
extern f32 D_800F1CAC;
extern f32 D_800F1CB0;
extern f32 D_800F1CB4;
extern f32 D_800F1CB8;
extern f32 D_800F1CBC;
extern f32 D_800F1CC0;
extern ? D_80164360;
extern ? D_80164370;
extern ? D_80164478;
extern s8 gCupSelection;
extern s32 gGlobalTimer;
extern ? gPlayers;
extern s8 D_8018EDF3;
static ? D_800E7500; /* unable to generate initializer; const */
static ? D_800E76CC; /* unable to generate initializer; const */
static ? D_800E86AB; /* unable to generate initializer; const */
static ? D_800E86AD; /* unable to generate initializer; const */
void func_800A34A8(void *arg0) {
s8 sp80;
@@ -10806,20 +10796,13 @@ void func_800A34A8(void *arg0) {
? sp78;
s32 sp68;
? *temp_a0;
f32 temp_f0;
f32 temp_f0_2;
f32 temp_f0_3;
f32 temp_f0_4;
f32 temp_f0_5;
s32 temp_s0_4;
s32 temp_s0_2;
s32 temp_s1;
s32 temp_s1_2;
s32 temp_v1;
s32 temp_v1_2;
s32 temp_v1_3;
s8 *temp_s0;
s8 *temp_s0_2;
s8 *temp_s0_3;
s8 temp_v0;
? *phi_a0;
s8 *phi_s0;
@@ -10841,26 +10824,23 @@ void func_800A34A8(void *arg0) {
do {
temp_a0 = phi_a0 + 8;
temp_s0 = phi_s0 + 4;
temp_s0->unk-4 = (&gPlayers + (phi_a0->unk0 * 0xDD8))->unk254;
temp_s0->unk-3 = (&gPlayers + (phi_a0->unk2 * 0xDD8))->unk254;
temp_s0->unk-2 = (&gPlayers + (phi_a0->unk4 * 0xDD8))->unk254;
temp_s0->unk-1 = (&gPlayers + (temp_a0->unk-2 * 0xDD8))->unk254;
temp_s0->unk-4 = gPlayers[phi_a0->unk0].characterId;
temp_s0->unk-3 = gPlayers[phi_a0->unk2].characterId;
temp_s0->unk-2 = gPlayers[phi_a0->unk4].characterId;
temp_s0->unk-1 = gPlayers[temp_a0->unk-2].characterId;
phi_a0 = temp_a0;
phi_s0 = temp_s0;
} while (temp_a0 != &D_80164370);
} else {
func_800A3A10(&sp80);
func_800A3A10(D_8018D9D0);
func_800A3A10(gGPOverallRanks);
}
set_text_color(4);
temp_f0 = D_800F1CAC;
func_80093324(arg0->unkC + 0x19, 0x19 - arg0->unk10, &D_800F0C34, 0, temp_f0, temp_f0);
func_80093324(arg0->unkC + 0x19, 0x19 - arg0->unk10, "driver's points", 0, 0.8f, 0.8f);
set_text_color(5);
temp_f0_2 = D_800F1CB0;
func_80093324(arg0->unkC + 0x36, 0x28 - arg0->unk10, &D_800F0C44, 0, temp_f0_2, temp_f0_2);
func_80093324(arg0->unkC + 0x36, 0x28 - arg0->unk10, "round", 0, 0.7f, 0.7f);
func_800A7894(gCourseSelection + 1, &sp78);
temp_f0_3 = D_800F1CB4;
func_80093324(arg0->unkC + 0x61, 0x28 - arg0->unk10, &sp79, 0, temp_f0_3, temp_f0_3);
func_80093324(arg0->unkC + 0x61, 0x28 - arg0->unk10, &sp79, 0, 0.7f, 0.7f);
phi_s1 = 0;
do {
temp_v1_2 = arg0->unk4;
@@ -10873,12 +10853,11 @@ void func_800A34A8(void *arg0) {
}
}
if (phi_v0 == 0) {
temp_s0_2 = &(&sp80)[phi_s1];
if (temp_v1_2 < 9) {
phi_v0_2 = *(&D_80164360 + (phi_s1 * 2));
phi_v1 = 0;
} else {
phi_v0_2 = *(&D_80164478 + (*temp_s0_2 * 2));
phi_v0_2 = *(&D_80164478 + ((&sp80)[phi_s1] * 2));
phi_v1 = 0xD;
}
if (phi_v0_2 < D_8018EDF3) {
@@ -10888,7 +10867,7 @@ void func_800A34A8(void *arg0) {
}
sp68 = phi_v1;
set_text_color(phi_a0_2);
func_800A3ADC(arg0, arg0->unkC + phi_v1 + 0x1C, ((phi_s1 * 0x10) - arg0->unk10) + 0x38, *temp_s0_2, phi_s1, &sp80);
func_800A3ADC(arg0, arg0->unkC + phi_v1 + 0x1C, ((phi_s1 * 0x10) - arg0->unk10) + 0x38, (&sp80)[phi_s1], phi_s1, &sp80);
}
temp_s1 = phi_s1 + 1;
phi_s1 = temp_s1;
@@ -10896,7 +10875,6 @@ void func_800A34A8(void *arg0) {
phi_s1_2 = 4;
do {
temp_v1_3 = arg0->unk4;
temp_s0_3 = &(&sp80)[phi_s1_2];
if ((temp_v1_3 != 8) && (temp_v1_3 != 9)) {
phi_v0_3 = 0;
} else {
@@ -10909,7 +10887,7 @@ void func_800A34A8(void *arg0) {
if (temp_v1_3 < 9) {
phi_v0_4 = *(&D_80164360 + (phi_s1_2 * 2));
} else {
phi_v0_4 = *(&D_80164478 + (*temp_s0_3 * 2));
phi_v0_4 = *(&D_80164478 + ((&sp80)[phi_s1_2] * 2));
}
if (phi_v0_4 < D_8018EDF3) {
phi_a0_3 = gGlobalTimer % 3;
@@ -10917,18 +10895,16 @@ void func_800A34A8(void *arg0) {
phi_a0_3 = 3;
}
set_text_color(phi_a0_3);
func_800A3ADC(arg0, 0xBE - arg0->unkC, arg0->unk10 + (phi_s1_2 * 0x10) + 0x5A, *temp_s0_3, phi_s1_2, &sp80);
func_800A3ADC(arg0, 0xBE - arg0->unkC, arg0->unk10 + (phi_s1_2 * 0x10) + 0x5A, (&sp80)[phi_s1_2], phi_s1_2, &sp80);
}
temp_s1_2 = phi_s1_2 + 1;
phi_s1_2 = temp_s1_2;
} while (temp_s1_2 != 8);
set_text_color(5);
temp_s0_4 = ((func_80093034(*(&D_800E7500 + (gCupSelection * 4))) + 8) * D_800F1CB8) / 2.0f;
temp_f0_4 = D_800F1CBC;
draw_text((-(((func_80093034(*(&D_800E76CC + (gCCSelection * 4))) + 8) * temp_f0_4) / 2.0f) - arg0->unkC) + 0xE6, arg0->unk10 + 0xE1, *(&D_800E7500 + (D_800DC540 * 4)), 0, temp_f0_4, temp_f0_4);
temp_s0_2 = ((func_80093034(*(&D_800E7500 + (gCupSelection * 4))) + 8) * 0.6f) / 2.0f;
draw_text((-(((func_80093034(*(&D_800E76CC + (gCCSelection * 4))) + 8) * 0.6f) / 2.0f) - arg0->unkC) + 0xE6, arg0->unk10 + 0xE1, *(&D_800E7500 + (D_800DC540 * 4)), 0, 0.6f, 0.6f);
temp_v0 = D_8018EDF3;
temp_f0_5 = D_800F1CC0;
draw_text((temp_s0_4 - arg0->unkC) + 0xE6, arg0->unk10 + 0xE1, *(&D_800E76CC + (*(&D_800E86AD + ((temp_v0 * 3) + *(&D_800E86AB + temp_v0))) * 4)), 0, temp_f0_5, temp_f0_5);
draw_text((temp_s0_2 - arg0->unkC) + 0xE6, arg0->unk10 + 0xE1, *(&D_800E76CC + (*(&D_800E86AD + ((temp_v0 * 3) + *(&D_800E86AB + temp_v0))) * 4)), 0, 0.6f, 0.6f);
}
}
#else
@@ -10936,9 +10912,9 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A34A8.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
extern ? D_80164478;
extern ? D_8018D9C8;
extern s8 D_8018EDF3;
void func_800A3A10(s8 *arg0) {
s16 temp_t0_2;
@@ -10950,7 +10926,7 @@ void func_800A3A10(s8 *arg0) {
s8 temp_v0;
s8 phi_v0;
s8 *phi_v1;
void *phi_a2;
s8 *phi_a2;
s8 phi_a1;
phi_v0 = 0;
@@ -10959,13 +10935,13 @@ void func_800A3A10(s8 *arg0) {
*phi_v1 = phi_v0;
phi_a1 = phi_v0;
if (phi_v0 > 0) {
phi_a2 = arg0 + phi_v0;
phi_a2 = &arg0[phi_v0];
loop_3:
temp_a3 = phi_a2->unk-1;
temp_t1 = phi_a2->unk0;
temp_a1 = phi_a1 - 1;
temp_t2 = *(&D_8018D9C8 + temp_t1);
temp_t0 = *(&D_8018D9C8 + temp_a3);
temp_t2 = gGPCharacterPoints[temp_t1];
temp_t0 = gGPCharacterPoints[temp_a3];
phi_a1 = temp_a1;
if (temp_t0 < temp_t2) {
phi_a2->unk0 = temp_a3;
@@ -10994,21 +10970,18 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A3A10.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
? func_80093324(s32, s32, s8 *, ?, f32, f32); // extern
? func_800939C8(s32, s32, s8 *, ?, f32, f32); // extern
? func_800A7894(s8, s8 *); // extern
extern ? D_800E76A8;
extern f32 D_800F1CC4;
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
? func_80093324(s32, s32, s8 *, ?, f32, f32); /* extern */
? func_800939C8(s32, s32, s8 *, ?, f32, f32); /* extern */
? func_800A7894(s8, s8 *); /* extern */
extern s32 D_8018D9BC;
extern ? D_8018D9C8;
static ? D_800E76A8; /* unable to generate initializer; const */
void func_800A3ADC(void *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5) {
s8 sp37;
s8 sp36;
s8 sp35;
s8 sp34;
f32 temp_f20;
s32 temp_v1;
void *phi_v0;
s32 phi_v1;
@@ -11023,7 +10996,7 @@ void func_800A3ADC(void *arg0, s32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 arg5)
phi_v0 = arg5 + arg4;
loop_4:
phi_v1_2 = phi_v1;
if (*(&D_8018D9C8 + phi_v0->unk0) == *(&D_8018D9C8 + phi_v0->unk-1)) {
if (gGPCharacterPoints[phi_v0->unk0] == gGPCharacterPoints[phi_v0->unk-1]) {
temp_v1 = phi_v1 - 1;
phi_v0 += -1;
phi_v1 = temp_v1;
@@ -11035,17 +11008,16 @@ loop_4:
}
func_800A7894(phi_v1_2 + 1, &sp34);
}
temp_f20 = D_800F1CC4;
sp36 = 0x2E;
sp37 = 0;
func_800939C8(arg1, arg2, &sp35, -4, temp_f20, temp_f20);
func_80093324(arg1 + 0xA, arg2, *(&D_800E76A8 + (arg3 * 4)), 0, temp_f20, temp_f20);
func_800A7894(*(&D_8018D9C8 + arg3), &sp34);
func_800939C8(arg1 + 0x47, arg2, &sp34, 0, temp_f20, temp_f20);
func_800939C8(arg1, arg2, &sp35, -4, 0.7f, 0.7f);
func_80093324(arg1 + 0xA, arg2, *(&D_800E76A8 + (arg3 * 4)), 0, 0.7f, 0.7f);
func_800A7894(gGPCharacterPoints[arg3], &sp34);
func_800939C8(arg1 + 0x47, arg2, &sp34, 0, 0.7f, 0.7f);
if ((arg4 < 4) && (arg0->unk4 < 9)) {
func_800A7894(*(D_8018D9BC + arg4), &sp34);
sp34 = 0x2B;
func_80093324(arg1 + 0x5A, arg2, &sp34, 0, temp_f20, temp_f20);
func_80093324(arg1 + 0x5A, arg2, &sp34, 0, 0.7f, 0.7f);
}
}
#else
@@ -16392,19 +16364,31 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AC324.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
void *func_800921B4(); /* extern */
void *func_800B536C(s32, s32, s32, void *); /* extern */
void **func_800CA330(?, s32); /* extern */
void *play_sound2(?, s32, u8 *, void *); /* extern */
extern void *D_800DC5EC;
s8 *func_800921B4(); /* extern */
s8 *func_800B536C(s32, s32, s32, void *); /* extern */
s8 *func_800CA330(?, s32); /* extern */
s8 *play_sound2(?, s32, u8 *, void *); /* extern */
extern s8 D_800DC5EC;
extern void *D_800DC5F0;
extern s16 D_8015F894;
extern ? D_80164360;
extern ? D_80164478;
extern void *D_8018D9BC;
extern ? D_8018D9C8;
extern void *D_8018D9D0;
extern s8 D_8018D9BC;
extern s8 D_8018D9D8;
extern s8 D_8018EDF3;
static s32 D_800DDB24 = 1;
static s8 gGP1stPlaceReward = 9; /* const */
static s8 gGP2ndPlaceReward = 6; /* const */
static s8 gGP3rdPlaceReward = 3; /* const */
static s8 gGP4thPlaceReward = 1; /* const */
void *func_800AC458(void *arg0) {
s32 sp1C;
//Something related to the point allotment screens at the end of a grand prix race
// Its unclear what exactly arg0 is, although unk4 of that struct(?) appears to be
// a form of a "current state" tracker. Each time this function runs it
// advances which "state" its in
s8 *func_800AC458(void *arg0) {
s32 place;
s32 sp18;
s32 temp_a1;
s32 temp_a1_2;
@@ -16419,22 +16403,22 @@ void *func_800AC458(void *arg0) {
s32 temp_t8;
s32 temp_v0_3;
s32 temp_v0_6;
s8 *temp_v1_2;
s8 *temp_v0;
s8 *temp_v0_4;
s8 *temp_v0_5;
u16 temp_t4;
u32 temp_v0_2;
u8 *temp_a2_2;
u8 temp_t0;
void **temp_v0_4;
void *temp_a3;
void *temp_v0;
void *temp_v0_5;
void *temp_v1;
void *temp_v1_3;
void *temp_v1_2;
s32 phi_a0;
void *phi_a3;
s32 phi_t1;
void **phi_v0;
s8 *phi_v0;
s32 phi_a1;
void **phi_v0_2;
s8 *phi_v0_2;
temp_v0_2 = arg0->unk4;
temp_a3 = arg0;
@@ -16444,10 +16428,11 @@ void *func_800AC458(void *arg0) {
case 0:
temp_a3->unkC = -0xA0;
temp_a3->unk4 = 1;
D_8018D9BC->unk0 = D_800F0B18;
D_8018D9BC->unk1 = D_800F0B19;
D_8018D9BC->unk2 = D_800F0B1A;
D_8018D9BC->unk3 = D_800F0B1B;
// Copy point rewards from data to some temp memory
D_8018D9BC->unk0 = gGP1stPlaceReward;
D_8018D9BC->unk1 = gGP2ndPlaceReward;
D_8018D9BC->unk2 = gGP3rdPlaceReward;
D_8018D9BC->unk3 = gGP4thPlaceReward;
temp_a3->unk20 = temp_a3->unkC;
return &D_8018D9BC;
case 1:
@@ -16485,11 +16470,14 @@ void *func_800AC458(void *arg0) {
}
default:
return phi_v0_2;
// Allocating point rewards for the players that finished the race
// in 1st, 2nd, 3rd and 4th place
case 3:
case 4:
case 5:
case 6:
temp_t3 = temp_a3->unk1C + 1;
// Using the "state" variable to deduce which player we're allocating points for
temp_a1_2 = temp_v0_2 - 3;
temp_a3->unk1C = temp_t3;
if (((temp_t3 % 3) == 0) || (D_8018D9D8 != 0)) {
@@ -16497,11 +16485,11 @@ void *func_800AC458(void *arg0) {
temp_t0 = *temp_a2_2;
if (temp_t0 > 0) {
*temp_a2_2 = temp_t0 - 1;
temp_v1_2 = *(&gPlayers->characterId + (*(&D_80164360 + (temp_a1_2 * 2)) * 0xDD8)) + &D_8018D9C8;
temp_t4 = *(&gPlayers->characterId + (*(&D_80164360 + (temp_a1_2 * 2)) * 0xDD8));
sp18 = 0;
arg0 = temp_a3;
*temp_v1_2 += 1;
sp1C = temp_a1_2;
gGPCharacterPoints[temp_t4] += 1;
place = temp_a1_2;
play_sound2(0x49008017, temp_a1_2, temp_a2_2, temp_a3);
phi_a3 = arg0;
if ((*(D_8018D9BC + temp_a1_2) == 0) && (arg0->unk20 == 0)) {
@@ -16519,6 +16507,7 @@ void *func_800AC458(void *arg0) {
temp_v0_3 = phi_a3->unk4;
phi_a3->unk20 = 0;
phi_a3->unk1C = 0;
// If not done alloting points
if (temp_v0_3 < 6) {
phi_a3->unk4 = temp_v0_3 + 1;
return temp_v0_3;
@@ -16556,8 +16545,8 @@ void *func_800AC458(void *arg0) {
if (D_8018D9D8 != 0) {
temp_a3->unk1C = temp_t7 - 5;
}
if ((temp_a3->unk1C <= 0) && (temp_a3->unk4 = 0xA, temp_a3->unk1C = 0, phi_a1 = 0, phi_v0_2 = &D_8018D9D0, (gCourseSelection == 3))) {
phi_v0 = &D_8018D9D0;
if ((temp_a3->unk1C <= 0) && (temp_a3->unk4 = 0xA, temp_a3->unk1C = 0, phi_a1 = 0, phi_v0_2 = gGPOverallRanks, (gCourseSelection == COURSE_BANSHEE_BOARDWALK))) {
phi_v0 = gGPOverallRanks;
loop_41:
if (*(&D_80164478 + (*phi_v0 * 2)) < D_8018EDF3) {
return func_800B536C(phi_a1, phi_a1, 8, temp_a3);
@@ -16598,8 +16587,8 @@ loop_41:
temp_a3->unk20 = temp_a1_4 + 0x10;
temp_v0_5 = D_800DC5EC;
temp_v0_5->unk32 = temp_v0_5->unk32 + 0x10;
temp_v1_3 = D_800DC5F0;
temp_v1_3->unk32 = temp_v1_3->unk32 - 0x10;
temp_v1_2 = D_800DC5F0;
temp_v1_2->unk32 = temp_v1_2->unk32 - 0x10;
return temp_v0_5;
}
temp_a3->unk20 = 0;
@@ -17082,14 +17071,29 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AD1A4.s")
#ifdef MIPS_TO_C
//generated by mips_to_c commit bd0364fa19633bd6201f8007e2d0a7ed87825909
s32 func_800B4520(); /* extern */
s32 func_800B5F30(); /* extern */
s32 func_800B6348(s32); /* extern */
? func_800B6708(); /* extern */
s32 osPfsFindFile(? *, u16, s32, ? *, ? *, ? *); /* extern */
? play_sound2(?, u16); /* extern */
extern void *D_800DC5EC;
extern void *D_800DC5F0;
extern u16 D_80162DD4;
extern s32 D_80162DF8;
extern void *D_8018D9BC;
extern s8 D_8018D9D8;
extern ? D_8018E868;
extern s32 D_8018EB78;
extern s32 D_8018EB7C;
extern s32 D_8018EB80;
extern ? D_8018EB84;
extern s8 D_8018EDF5;
static u16 D_800E86F0; /* type too large by 2; 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 */
u16 D_800E86F0; /* unable to generate initializer; const */
void func_800AD2E8(void *arg0) {
s32 sp28;
@@ -17103,6 +17107,8 @@ void func_800AD2E8(void *arg0) {
s32 temp_v0_7;
s32 temp_v0_8;
s8 temp_t3;
struct Controller *temp_t6;
struct Controller *temp_v1_2;
u16 temp_a1;
u16 temp_a1_2;
u32 temp_t2;
@@ -17112,10 +17118,8 @@ void func_800AD2E8(void *arg0) {
u32 temp_v0_4;
u32 temp_v0_5;
u32 temp_v0_6;
void *temp_t6;
void *temp_v0_2;
void *temp_v1;
void *temp_v1_2;
s32 phi_a1;
s32 phi_a0;
u16 phi_a1_2;
@@ -17129,10 +17133,10 @@ void func_800AD2E8(void *arg0) {
case 0: /* switch 1 */
arg0->unkC = -0xA0;
arg0->unk4 = 1;
D_8018D9BC->unk0 = D_800F0B18;
D_8018D9BC->unk1 = D_800F0B19;
D_8018D9BC->unk2 = D_800F0B1A;
D_8018D9BC->unk3 = D_800F0B1B;
D_8018D9BC->unk0 = gGP1stPlaceReward;
D_8018D9BC->unk1 = gGP2ndPlaceReward;
D_8018D9BC->unk2 = gGP3rdPlaceReward;
D_8018D9BC->unk3 = gGP4thPlaceReward;
arg0->unk20 = arg0->unkC;
return;
case 1: /* switch 1 */
@@ -17169,8 +17173,8 @@ void func_800AD2E8(void *arg0) {
case 10: /* switch 1 */
if (func_800B4520() == 0) {
temp_v1_2 = D_800DC4BC;
temp_a1 = temp_v1_2->unk6;
temp_a0_2 = temp_a1 | temp_v1_2->unkC;
temp_a1 = temp_v1_2->buttonPressed;
temp_a0_2 = temp_a1 | temp_v1_2->stickPressed;
phi_a0 = temp_a0_2;
phi_a1_2 = temp_a1;
if ((temp_a0_2 & 0x800) != 0) {
@@ -17188,8 +17192,8 @@ void func_800AD2E8(void *arg0) {
}
arg0->unk8 = -1;
temp_t6 = D_800DC4BC;
temp_a1_2 = temp_t6->unk6;
phi_a0 = temp_a1_2 | temp_t6->unkC;
temp_a1_2 = temp_t6->buttonPressed;
phi_a0 = temp_a1_2 | temp_t6->stickPressed;
phi_a1_2 = temp_a1_2;
}
}
@@ -17205,7 +17209,7 @@ void func_800AD2E8(void *arg0) {
temp_v0_5 = arg0->unk4;
if ((temp_v0_5 == 0xA) && (D_80162DD4 != 0)) {
arg0->unk4 = temp_v0_5 - 2;
phi_a1_3 = D_800DC4BC->unk6;
phi_a1_3 = D_800DC4BC->buttonPressed;
} else {
play_sound2(0x49008000, phi_a1_2);
temp_f0_2 = arg0->unk24;
@@ -17213,7 +17217,7 @@ void func_800AD2E8(void *arg0) {
arg0->unk24 = temp_f0_2 + 4.0;
}
arg0->unk8 = 1;
phi_a1_3 = D_800DC4BC->unk6;
phi_a1_3 = D_800DC4BC->buttonPressed;
}
}
}
src/code_800AF9B0.c
+41 -9
View File
@@ -2530,17 +2530,49 @@ GLOBAL_ASM("asm/non_matchings/code_800AF9B0/func_800B3B58.s")
? func_800CA008(?, ?, s32); /* extern */
? func_800CB2C4(); /* extern */
? play_sound2(?, s8 *, s8 *, s8); /* extern */
extern ? D_8018D9C8;
extern ? D_8018D9D0;
extern s32 D_800DC50C;
extern s32 D_800DC524;
extern s32 D_800DC530;
extern s32 D_800DC540;
extern s16 D_8015F890;
extern s16 D_8015F892;
extern s32 D_80162DC8;
extern s32 D_80162DCC;
extern s16 D_80162DD4;
extern s16 D_80162DD8;
extern s32 D_80162E00;
extern s16 D_8016556E;
extern s32 D_8018EDE0;
extern s8 D_8018EDE8;
extern s8 D_8018EDE9;
extern s8 D_8018EDEA;
extern s8 D_8018EDEB;
extern s8 D_8018EDEC;
extern s8 D_8018EDED;
extern s8 D_8018EDEE;
extern s8 D_8018EDEF;
extern s8 D_8018EDF1;
extern s8 D_8018EDF3;
extern s8 D_8018EDF7;
extern s8 D_8018EDFA;
extern s8 D_8018EDFB;
extern s8 D_8018EDFC;
extern s32 D_8018EE00;
extern s32 D_8018EE04;
extern s8 D_8018EE08;
extern s8 D_8018EE0A;
extern s16 gEnableDebugMode;
static s8 D_800E86A8 = 0; /* const */
static ? D_800F2BDF; /* unable to generate initializer; const */
s32 gIsMirrorMode = 0;
void func_800B3F74(u32 arg0) {
? *temp_v0_5;
s32 temp_v0;
s32 temp_v0_3;
s32 temp_v0_4;
s8 *temp_a1;
s8 *temp_a2;
s8 *temp_v0_5;
s8 temp_a0;
s8 temp_a3;
s8 temp_a3_2;
@@ -2551,7 +2583,7 @@ void func_800B3F74(u32 arg0) {
s8 *phi_a2;
s8 *phi_a1;
s32 phi_a0;
? *phi_v0_2;
s8 *phi_v0_2;
D_8018EDEF = 1;
D_8018EE00 = 0;
@@ -2589,7 +2621,7 @@ void func_800B3F74(u32 arg0) {
gIsMirrorMode = 0;
gEnableDebugMode = 0;
gCupSelection = MUSHROOM_CUP;
gCourseSelection = 0;
gCourseSelection = COURSE_MARIO_RACEWAY;
D_8018EDF7 = 0;
if (D_8018EDF3 <= 0) {
D_8018EDF3 = 1;
@@ -2721,7 +2753,7 @@ void func_800B3F74(u32 arg0) {
case 3:
case 13:
if (gModeSelection == BATTLE) {
gCupSelection = 4;
gCupSelection = BATTLE_CUP;
D_800DC540 = 4;
D_8018EDEC = 4;
} else {
@@ -2740,9 +2772,9 @@ void func_800B3F74(u32 arg0) {
play_sound2(0x49009013);
D_8018EE0A = 0;
if (gModeSelection == GRAND_PRIX) {
gCourseSelection = 0;
gCourseSelection = COURSE_MARIO_RACEWAY;
}
phi_v0_2 = &D_8018D9C8;
phi_v0_2 = gGPCharacterPoints;
do {
temp_v0_5 = phi_v0_2 + 4;
temp_v0_5->unk-3 = 0;
@@ -2750,7 +2782,7 @@ void func_800B3F74(u32 arg0) {
temp_v0_5->unk-1 = 0;
temp_v0_5->unk-4 = 0;
phi_v0_2 = temp_v0_5;
} while (temp_v0_5 != &D_8018D9D0);
} while (temp_v0_5 != gGPOverallRanks);
break;
}
func_800B44AC();
src/code_80281780.c
+2 -2
View File
@@ -37,7 +37,7 @@ void func_80281780(void) {
} else {
D_800E86A8[0] = 0;
}
bcopy(&D_80284ED0, &D_8018D9D0, 8);
bcopy(&D_80284ED0, &gGPOverallRanks, 8);
}
}
}
@@ -45,7 +45,7 @@ void func_80281780(void) {
s32 func_80281880(s32 arg0) {
s32 i;
for (i = 0; i < 8; i++) {
if (D_8018D9D0[i] == D_800E86A8[arg0]) break;
if (gGPOverallRanks[i] == D_800E86A8[arg0]) break;
}
return i;
}
src/code_80281780.h
+1 -1
View File
@@ -67,7 +67,7 @@ extern s8 D_800E86A8[];
extern u16 gEnableDebugMode;
extern void *D_80284ED0;
extern s8 D_8018D9D0[];
extern s8 gGPOverallRanks[8];
extern s8 D_8018EDF3;
extern s32 _data_821D10SegmentRomStart;