mirror/mk64
1
0
Fork 0
mirror of https://github.com/n64decomp/mk64 synced 2026-06-26 00:54:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

code_800AF9B0 - ghost data (#133)

Browse Source 
* Match functions related to struct at D_8018EE10

* Remove asm for matched functions

* Match func_800B64EC, func_800B6708, and func_800B6798

* Match func_80091EE4. Fix unused variable warnings in code_80091750.c

* Name some of the fields in struct_8018EE10_entry
This commit is contained in:
ChiefFruitcake
2022-01-09 21:24:30 -05:00
committed by GitHub
parent 7acd1cbc20
commit bc99dedb8b
11 changed files with 111 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_80091750.c
+15 -32
View File
@@ -371,44 +371,27 @@ extern OSMesgQueue gSIEventMesgQueue;
GLOBAL_ASM("asm/non_matchings/code_80091750/func_80091D74.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
s32 func_800B5F30(); // extern
? func_800B64EC(s32); // extern
? func_800B6708(); // extern
extern s8 D_800E86F8;
extern s8 D_8018EDFB;
extern ? D_8018EE10;
extern s8 gCupSelection;
void func_80091EE4(void) {
s32 temp_s0;
s32 temp_s2;
void *temp_v0;
s32 phi_s0;
s32 phi_s0_2;
s32 tmp;
D_800E86F8 = 0;
if ((D_8018EDFB != 0) && (func_800B5F30() == 0)) {
tmp = func_800B5F30();
if ((D_8018EDFB != 0) && (tmp == 0)) {
temp_s2 = (gCupSelection * 4) + gCupCourseSelection;
func_800B6708();
phi_s0 = 0;
do {
temp_v0 = &D_8018EE10 + (phi_s0 << 7);
phi_s0_2 = phi_s0;
if ((temp_v0->unk4 != 0) && (temp_s2 == temp_v0->unk5)) {
func_800B64EC(phi_s0);
for (temp_s0 = 0; temp_s0 < 2; ++temp_s0) {
if ((D_8018EE10[temp_s0].ghostDataSaved != 0) && (temp_s2 == D_8018EE10[temp_s0].courseIndex)) {
func_800B64EC(temp_s0);
temp_s0 = 2;
D_8018EDFB = 0;
phi_s0_2 = 2;
}
temp_s0 = phi_s0_2 + 1;
phi_s0 = temp_s0;
} while (temp_s0 < 2);
}
}
}
#else
GLOBAL_ASM("asm/non_matchings/code_80091750/func_80091EE4.s")
#endif
#ifdef MIPS_TO_C
//generated by mips_to_c commit 3c3b0cede1a99430bfd3edf8d385802b94f91307
@@ -9232,7 +9215,7 @@ void func_800A09E0(struct_8018D9E0_entry *arg0) {
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A09E0.s")
#endif
void func_800A0AD0(struct_8018D9E0_entry *unused) {
void func_800A0AD0(UNUSED struct_8018D9E0_entry *unused) {
struct_8018D9E0_entry *temp_t1;
// Find struct_8018D9E0_entry with a type/id of 0xDA
temp_t1 = func_800AAEF4(0xDA);
@@ -12619,7 +12602,7 @@ void func_800A7258(struct_8018D9E0_entry *arg0) {
// Podium scene, top line
void func_800A72FC(struct_8018D9E0_entry *arg0) {
s32 pad;
UNUSED s32 pad;
s32 cupNameLength = (((f32) get_string_width(D_800E7500[gCupSelection]) * 1) + 10) / 2;
s32 ccNameLength = (((f32) get_string_width(D_800E76CC[gCCSelection]) * 1) + 10) / 2;
@@ -12630,7 +12613,7 @@ void func_800A72FC(struct_8018D9E0_entry *arg0) {
}
void func_800A7448(struct_8018D9E0_entry *arg0) {
s32 pad;
UNUSED s32 pad;
s32 sp40;
s32 sp3C;
s32 thing = D_802874F5;
@@ -12648,7 +12631,7 @@ void func_800A7448(struct_8018D9E0_entry *arg0) {
}
void func_800A75A0(struct_8018D9E0_entry *arg0) {
s32 pad;
UNUSED s32 pad;
s32 topThree;
if (D_802874F5 < 3) {
@@ -13676,7 +13659,7 @@ void func_800A8CA4(void *arg0) {
GLOBAL_ASM("asm/non_matchings/code_80091750/func_800A8CA4.s")
#endif
void func_800A8E14(struct_8018D9E0_entry *unused) {
void func_800A8E14(UNUSED struct_8018D9E0_entry *unused) {
set_text_color(TEXT_YELLOW);
draw_text(0x98, 0x44, D_800E77A8, 0, 1.0f, 1.0f);
func_80093324(0x17, 0x58, D_800E77AC, 0, D_800F24A8, D_800F24AC);