mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-08-14 12:53:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

controller pak stuff (#333)

Browse Source 
- Named some variables
This commit is contained in:
tomas
2023-07-11 18:14:23 +00:00
committed by GitHub
parent cf33e2ea5f
commit 84edd67231
17 changed files with 420 additions and 525 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_80091750.c
+47 -47
View File
@@ -280,25 +280,25 @@ s32 func_80091D74(void) {
}
osPfsIsPlug(&gSIEventMesgQueue, &sp67);
if (sp67 & 1) {
if (osPfsInit(&gSIEventMesgQueue, &D_8018E868, 0)) {
if (osPfsInit(&gSIEventMesgQueue, &gControllerPak1FileHandle, 0)) {
return 0;
}
} else {
return 0;
}
if (osPfsNumFiles(&D_8018E868, &D_8018EB78, &D_8018EB7C)) {
if (osPfsNumFiles(&gControllerPak1FileHandle, &gControllerPak1NumFilesUsed, &gControllerPak1MaxWriteableFiles)) {
return 0;
}
for (i = 0; i < 16; i++) {
D_8018EB38[i] = osPfsFileState(&D_8018E868, i, D_8018E938 + i);
D_8018EB38[i] = osPfsFileState(&gControllerPak1FileHandle, i, D_8018E938 + i);
}
if (osPfsFreeBlocks(&D_8018E868, &gControllerPakNumPagesFree)) {
if (osPfsFreeBlocks(&gControllerPak1FileHandle, &gControllerPak1NumPagesFree)) {
return 0;
}
gControllerPakNumPagesFree >>= 8;
gControllerPak1NumPagesFree >>= 8;
return 1;
}
@@ -307,7 +307,7 @@ void func_80091EE4(void) {
s32 temp_s2;
s32 tmp;
D_800E86F8 = 0;
gControllerPak1State = BAD;
tmp = func_800B5F30();
if ((D_8018EDFB != 0) && (tmp == 0)) {
@@ -6947,7 +6947,7 @@ loop_3:
return;
case 0x69:
func_800996BC(segmented_to_virtual_dupe(D_02004A0C), 0);
if (controller_pak_status() == 0) {
if (controller_pak_1_status() == PFS_NO_ERROR) {
func_800B6708();
return;
}
@@ -6962,7 +6962,7 @@ loop_3:
return;
case 0x8C:
func_800996BC(segmented_to_virtual_dupe(D_02004A34), 0);
if (controller_pak_status() == 0) {
if (controller_pak_1_status() == PFS_NO_ERROR) {
func_800B6708();
return;
}
@@ -7054,7 +7054,7 @@ block_63:
var_ra->unk1C = (s32) gTimeTrialDataCourseIndex;
func_800996BC(segmented_to_virtual_dupe(D_02004A0C), 0);
func_8006EF60();
if (controller_pak_status) == 0) {
if (controller_pak_1_status() == PFS_NO_ERROR) {
func_800B6708();
return;
}
@@ -8048,7 +8048,7 @@ void func_800A0DFC(void) {
s32 var_s0;
s32 var_s1;
var_s0 = gControllerPakNumPagesFree;
var_s0 = gControllerPak1NumPagesFree;
var_s1 = 0x00000110;
do {
temp_t6 = var_s0 % 10;
@@ -12954,15 +12954,15 @@ GLOBAL_ASM("asm/non_matchings/code_80091750/func_800AA280.s")
//generated by m2c commit 8267401fa4ef7a38942dcca43353cc1bcc6efabc
s32 check_for_controller_pak(?); /* extern */
extern s8 D_800E86AC;
extern u16 D_800E86F0;
extern u32 D_800E86F4;
extern s8 D_800E86F8;
extern u8 D_800F2E64;
extern u8 D_800F2E74;
extern OSPfs D_8018E868;
extern s32 D_8018EB78;
extern s32 D_8018EB7C;
extern s32 D_8018EB84;
extern u16 gCompanyCode;
extern u32 gGameCode;
extern s8 gControllerPak1State;
extern u8 gGameName;
extern u8 gExtCode;
extern OSPfs gControllerPak1FileHandle;
extern s32 gControllerPak1NumFilesUsed;
extern s32 gControllerPak1MaxWriteableFiles;
extern s32 gControllerPak1FileNote;
extern s8 gMainMenuSelectionDepth;
void func_800AA2EC(struct_8018D9E0_entry *arg0) {
@@ -12987,9 +12987,9 @@ void func_800AA2EC(struct_8018D9E0_entry *arg0) {
case CONFIRM_OK_SELECTION_FROM_BACK_OUT:
case TIME_TRIALS_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) {
if (gControllerPak1State != 0) {
sp20 = 0;
temp_v0_2 = osPfsFindFile(&D_8018E868, D_800E86F0, D_800E86F4, &D_800F2E64, &D_800F2E74, &D_8018EB84);
temp_v0_2 = osPfsFindFile(&gControllerPak1FileHandle, gCompanyCode, gGameCode, &gGameName, &gExtCode, &gControllerPak1FileNote);
var_t1 = 0;
switch (temp_v0_2) { /* switch 1; irregular */
case 5: /* switch 1 */
@@ -13000,17 +13000,17 @@ void func_800AA2EC(struct_8018D9E0_entry *arg0) {
break;
default: /* switch 1 */
case 2: /* switch 1 */
D_800E86F8 = 0;
gControllerPak1State = 0;
break;
}
}
if (var_t1 == 0) {
if (D_800E86F8 == 0) {
if (gControllerPak1State == 0) {
if (check_for_controller_pak(0) == 0) {
arg0->unk4 = 2;
return;
}
temp_v0_3 = osPfsInit(&gSIEventMesgQueue, &D_8018E868, 0);
temp_v0_3 = osPfsInit(&gSIEventMesgQueue, &gControllerPak1FileHandle, 0);
if (temp_v0_3 != 0) {
if (temp_v0_3 != 1) {
if (temp_v0_3 != 4) {
@@ -13031,28 +13031,28 @@ block_22:
arg0->unk4 = 2;
return;
}
D_800E86F8 = 1;
if (osPfsFindFile(&D_8018E868, D_800E86F0, D_800E86F4, &D_800F2E64, &D_800F2E74, &D_8018EB84) == 0) {
gControllerPak1State = 1;
if (osPfsFindFile(&gControllerPak1FileHandle, gCompanyCode, gGameCode, &gGameName, &gExtCode, &gControllerPak1FileNote) == 0) {
arg0->unk4 = 1;
return;
}
if (osPfsNumFiles(&D_8018E868, &D_8018EB78, &D_8018EB7C) != 0) {
if (osPfsNumFiles(&gControllerPak1FileHandle, &gControllerPak1NumFilesUsed, &gControllerPak1MaxWriteableFiles) != 0) {
arg0->unk4 = 3;
return;
}
if (osPfsFreeBlocks(&D_8018E868, &gControllerPakNumPagesFree) != 0) {
if (osPfsFreeBlocks(&gControllerPak1FileHandle, &gControllerPak1NumPagesFree) != 0) {
arg0->unk4 = 3;
return;
}
gControllerPakNumPagesFree = (s32) gControllerPakNumPagesFree >> 8;
gControllerPak1NumPagesFree = (s32) gControllerPak1NumPagesFree >> 8;
goto block_32;
}
block_32:
if (D_8018EB7C >= D_8018EB78) {
if (gControllerPak1MaxWriteableFiles >= gControllerPak1NumFilesUsed) {
arg0->unk4 = 5;
return;
}
if (gControllerPakNumPagesFree >= 0x79) {
if (gControllerPak1NumPagesFree >= 0x79) {
arg0->unk4 = 1;
return;
}
@@ -14990,9 +14990,9 @@ void func_800AD2E8(struct_8018D9E0_entry *arg0) {
if (temp_f0_3 < 4.2) {
arg0->unk24 = (f32) (temp_f0_3 + 4.0);
}
if (D_800E86F8 != 0) {
if (gControllerPak1State != 0) {
sp28 = 0;
temp_v0_6 = osPfsFindFile(&D_8018E868, D_800E86F0, D_800E86F4, D_800F2E64, D_800F2E74, &D_8018EB84);
temp_v0_6 = osPfsFindFile(&gControllerPak1FileHandle, gCompanyCode, gGameCode, gGameName, gExtCode, &gControllerPak1FileNote);
var_v1 = 0;
switch (temp_v0_6) { /* switch 4; irregular */
case 5: /* switch 4 */
@@ -15007,12 +15007,12 @@ void func_800AD2E8(struct_8018D9E0_entry *arg0) {
case 2: /* switch 4 */
/* fallthrough */
default: /* switch 4 */
D_800E86F8 = 0;
gControllerPak1State = 0;
break;
}
}
if (var_v1 == 0) {
if (D_800E86F8 == 0) {
if (gControllerPak1State == 0) {
sp28 = var_v1;
temp_v0_7 = func_800B5F30();
var_v1_2 = var_v1;
@@ -15044,7 +15044,7 @@ void func_800AD2E8(struct_8018D9E0_entry *arg0) {
play_sound2(0x4900FF07);
return;
}
if (osPfsFindFile(&D_8018E868, D_800E86F0, D_800E86F4, D_800F2E64, D_800F2E74, &D_8018EB84) == 0) {
if (osPfsFindFile(&gControllerPak1FileHandle, gCompanyCode, gGameCode, gGameName, gExtCode, &gControllerPak1FileNote) == 0) {
func_800B6708();
arg0->unk4 = func_800B6348((gCupSelection * 4) + gCupCourseSelection) + 0x11;
play_sound2(0x49008001);
@@ -15053,12 +15053,12 @@ void func_800AD2E8(struct_8018D9E0_entry *arg0) {
goto block_56;
}
block_56:
if (D_8018EB7C >= D_8018EB78) {
if (gControllerPak1MaxWriteableFiles >= gControllerPak1NumFilesUsed) {
arg0->unk4 = 0x0000000E;
play_sound2(0x4900FF07);
return;
}
if (gControllerPakNumPagesFree >= 0x79) {
if (gControllerPak1NumPagesFree >= 0x79) {
arg0->unk4 = 0x00000013;
arg0->unk1C = 0;
play_sound2(0x49008001);
@@ -15293,9 +15293,9 @@ void func_800AE218(struct_8018D9E0_entry *arg0) {
if (temp_f0_3 < 4.2) {
arg0->unk24 = (f32) (temp_f0_3 + 4.0);
}
if (D_800E86F8 != 0) {
if (gControllerPak1State != 0) {
sp28 = 0;
temp_v0_2 = osPfsFindFile(&D_8018E868, D_800E86F0, D_800E86F4, D_800F2E64, D_800F2E74, &D_8018EB84);
temp_v0_2 = osPfsFindFile(&gControllerPak1FileHandle, gCompanyCode, gGameCode, gGameName, gExtCode, &gControllerPak1FileNote);
var_v1 = 0;
switch (temp_v0_2) { /* switch 3; irregular */
case 5: /* switch 3 */
@@ -15308,7 +15308,7 @@ void func_800AE218(struct_8018D9E0_entry *arg0) {
case 2: /* switch 3 */
/* fallthrough */
default: /* switch 3 */
D_800E86F8 = 0;
gControllerPak1State = 0;
break;
}
}
@@ -15316,7 +15316,7 @@ void func_800AE218(struct_8018D9E0_entry *arg0) {
play_sound2(0x49008001);
return;
}
if (D_800E86F8 == 0) {
if (gControllerPak1State == 0) {
sp28 = var_v1;
temp_v0_3 = func_800B5F30();
var_v1_2 = var_v1;
@@ -15348,7 +15348,7 @@ void func_800AE218(struct_8018D9E0_entry *arg0) {
play_sound2(0x4900FF07);
return;
}
if (osPfsFindFile(&D_8018E868, D_800E86F0, D_800E86F4, D_800F2E64, D_800F2E74, &D_8018EB84) == 0) {
if (osPfsFindFile(&gControllerPak1FileHandle, gCompanyCode, gGameCode, gGameName, gExtCode, &gControllerPak1FileNote) == 0) {
func_800B6708();
arg0->unk4 = func_800B6348((gCupSelection * 4) + gCupCourseSelection) + 0x1E;
play_sound2(0x49008001);
@@ -15357,12 +15357,12 @@ void func_800AE218(struct_8018D9E0_entry *arg0) {
goto block_49;
}
block_49:
if (D_8018EB7C >= D_8018EB78) {
if (gControllerPak1MaxWriteableFiles >= gControllerPak1NumFilesUsed) {
arg0->unk4 = 0x00000018;
play_sound2(0x4900FF07);
return;
}
if (gControllerPakNumPagesFree >= 0x79) {
if (gControllerPak1NumPagesFree >= 0x79) {
arg0->unk4 = 0x00000020;
arg0->unk1C = 0;
play_sound2(0x49008001);
@@ -15520,7 +15520,7 @@ block_49:
break;
case 40: /* switch 1 */
if (arg0->unk1C == 1) {
if (osPfsFindFile(&D_8018E868, D_800E86F0, D_800E86F4, D_800F2E64, D_800F2E74, &D_8018EB84) != 0) {
if (osPfsFindFile(&gControllerPak1FileHandle, gCompanyCode, gGameCode, gGameName, gExtCode, &gControllerPak1FileNote) != 0) {
arg0->unk4 = 0x00000029;
play_sound2(0x4900FF07);
return;
@@ -15598,7 +15598,7 @@ void func_800AEDBC(struct_8018D9E0_entry *arg0) {
if (arg0->unk1C != gTimeTrialDataCourseIndex) {
arg0->unk1C = (s32) gTimeTrialDataCourseIndex;
func_8009A594(arg0->D_8018DEE0_index, 0, segmented_to_virtual_dupe_2(D_800E7E34[gCupCourseOrder[gTimeTrialDataCourseIndex / 4][gTimeTrialDataCourseIndex % 4]]));
if (controller_pak_status() == 0) {
if (controller_pak_1_status() == PFS_NO_ERROR) {
func_800B6708();
} else {
D_8018EE10[0].ghostDataSaved = 0;