falso
/
perfect_dark
mirror of https://github.com/n64decomp/perfect_dark.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename more filemgr symbols

This commit is contained in:
Ryan Dwyer 2020-11-12 22:06:48 +10:00
parent 487bf5c3da
commit 52c332dd5b
23 changed files with 570 additions and 745 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/camdraw.c
View File

@ -8033,10 +8033,10 @@ glabel func0f15015c
/* f1506d4: a078009d */ sb $t8,0x9d($v1)
/* f1506d8: 00102600 */ sll $a0,$s0,0x18
/* f1506dc: 24090001 */ addiu $t1,$zero,0x1
/* f1506e0: 3c018007 */ lui $at,%hi(g_SaveLocations+0x1c)
/* f1506e0: 3c018007 */ lui $at,%hi(g_FileLists+0x1c)
/* f1506e4: 00047603 */ sra $t6,$a0,0x18
/* f1506e8: 27aa1044 */ addiu $t2,$sp,0x1044
/* f1506ec: ac295bdc */ sw $t1,%lo(g_SaveLocations+0x1c)($at)
/* f1506ec: ac295bdc */ sw $t1,%lo(g_FileLists+0x1c)($at)
/* f1506f0: afaa0010 */ sw $t2,0x10($sp)
/* f1506f4: 01c02025 */ or $a0,$t6,$zero
/* f1506f8: 02402825 */ or $a1,$s2,$zero

16
src/game/data/data_01a3a0.c
View File

@ -23,14 +23,14 @@
// 1ae10
struct menuitem menuitems_gamefiles2[] = {
{ MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(100), 0x00000000, NULL }, // "Copy:"
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(103), 0x00000000, filemanOpenCopyFileMenuHandler }, // "Single Player Agent File"
{ MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(104), 0x00000000, filemanOpenCopyFileMenuHandler }, // "Combat Simulator Settings File"
{ MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS(105), 0x00000000, filemanOpenCopyFileMenuHandler }, // "Combat Simulator Player File"
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(103), 0x00000000, filemgrOpenCopyFileMenuHandler }, // "Single Player Agent File"
{ MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(104), 0x00000000, filemgrOpenCopyFileMenuHandler }, // "Combat Simulator Settings File"
{ MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS(105), 0x00000000, filemgrOpenCopyFileMenuHandler }, // "Combat Simulator Player File"
{ MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
{ MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(101), 0x00000000, NULL }, // "Delete:"
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(103), 0x00000000, filemanOpenDeleteFileMenuHandler }, // "Single Player Agent File"
{ MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(104), 0x00000000, filemanOpenDeleteFileMenuHandler }, // "Combat Simulator Settings File"
{ MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS(105), 0x00000000, filemanOpenDeleteFileMenuHandler }, // "Combat Simulator Player File"
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(103), 0x00000000, filemgrOpenDeleteFileMenuHandler }, // "Single Player Agent File"
{ MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(104), 0x00000000, filemgrOpenDeleteFileMenuHandler }, // "Combat Simulator Settings File"
{ MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS(105), 0x00000000, filemgrOpenDeleteFileMenuHandler }, // "Combat Simulator Player File"
{ MENUITEMTYPE_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(102), 0x00000000, (void *)&g_PakChoosePakMenuDialog }, // "Delete Game Notes..."
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
@ -49,7 +49,7 @@ struct menudialog menudialog_gamefiles2 = {
// 1af18
struct menuitem menuitems_fileselect2[] = {
{ MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(96), 0x00000000, NULL }, // "Choose Your Reality"
{ MENUITEMTYPE_LIST, 0, 0x00200000, 0x000000f5, 0x00000000, filemanChooseAgentListMenuHandler },
{ MENUITEMTYPE_LIST, 0, 0x00200000, 0x000000f5, 0x00000000, filemgrChooseAgentListMenuHandler },
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
@ -58,7 +58,7 @@ struct menudialog menudialog_fileselect2 = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS(95), // "Perfect Dark"
menuitems_fileselect2,
filemanMainMenuDialog,
filemgrMainMenuDialog,
0x00000020,
&menudialog_gamefiles2,
};

2
src/game/data/data_02a0e0.c
View File

@ -815,7 +815,7 @@ struct menudialog menudialog_mpsavesetupname = {
// 2ad14
struct menuitem menuitems_mpsavesetup[] = {
{ MENUITEMTYPE_LABEL, 0, 0x00000210, L_MPWEAPONS(230), (u32)&mpMenuTextSetupName, NULL }, // "Name:"
{ MENUITEMTYPE_LABEL, 0, 0x00000230, (u32)&filemanMenuTextDeviceName, 0x00000000, NULL },
{ MENUITEMTYPE_LABEL, 0, 0x00000230, (u32)&filemgrMenuTextDeviceName, 0x00000000, NULL },
{ MENUITEMTYPE_LABEL, 0, 0x00000010, L_MPMENU(184), 0x00000000, NULL }, // "Do you want to save over your original game file?"
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(185), 0x00000000, menuhandlerMpSaveSetupOverwrite }, // "Save Over Original"
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_MPMENU(186), 0x00000000, menuhandlerMpSaveSetupCopy }, // "Save Copy"

10
src/game/endscreen.c
View File

@ -1313,8 +1313,8 @@ glabel endscreenPrepare
/* f10ec5c: 0fc44270 */ jal func0f1109c0
/* f10ec60: a02e232c */ sb $t6,%lo(g_AltTitle)($at)
.L0f10ec64:
/* f10ec64: 3c04800a */ lui $a0,%hi(var800a22c0)
/* f10ec68: 248422c0 */ addiu $a0,$a0,%lo(var800a22c0)
/* f10ec64: 3c04800a */ lui $a0,%hi(g_FilemgrLoadedMainFile)
/* f10ec68: 248422c0 */ addiu $a0,$a0,%lo(g_FilemgrLoadedMainFile)
/* f10ec6c: 00002825 */ or $a1,$zero,$zero
/* f10ec70: 0fc42539 */ jal func0f1094e4
/* f10ec74: 00003025 */ or $a2,$zero,$zero
@ -1494,7 +1494,7 @@ glabel endscreenPrepare
// }
// }
//
// func0f1094e4(&var800a22c0, 0, 0);
// func0f1094e4(&g_FilemgrLoadedMainFile, 0, 0);
// }
//
// if (g_MenuData.root == MENUROOT_ENDSCREEN) {
@ -1574,7 +1574,7 @@ void soloPushCoopModeEndscreen(void)
}
if (g_Vars.currentplayer == g_Vars.bond) {
func0f1094e4(&var800a22c0, 0, NULL);
func0f1094e4(&g_FilemgrLoadedMainFile, 0, NULL);
}
g_MpPlayerNum = prevplayernum;
@ -1640,7 +1640,7 @@ void soloPushAntiModeEndscreen(void)
}
}
func0f1094e4(&var800a22c0, 0, 0);
func0f1094e4(&g_FilemgrLoadedMainFile, 0, 0);
} else {
if (g_Vars.anti->aborted == 0 &&
(g_Vars.bond->isdead || g_Vars.bond->aborted || objectiveIsAllComplete() == false)) {

2
src/game/game_0b63b0.c
View File

@ -5107,7 +5107,7 @@ glabel var7f1ad630
/* f0bade4: 00000000 */ nop
/* f0bade8: 10000006 */ b .L0f0bae04
/* f0badec: 00402025 */ or $a0,$v0,$zero
/* f0badf0: 0fc43240 */ jal filemanConsiderPushingFileSelectDialog
/* f0badf0: 0fc43240 */ jal filemgrConsiderPushingFileSelectDialog
/* f0badf4: 00000000 */ nop
/* f0badf8: 10000002 */ b .L0f0bae04
/* f0badfc: 00402025 */ or $a0,$v0,$zero

6
src/game/game_0f09f0.c
View File

@ -2832,8 +2832,8 @@ glabel func0f0f3220
/* f0f32fc: 24080001 */ addiu $t0,$zero,0x1
.L0f0f3300:
/* f0f3300: 11000009 */ beqz $t0,.L0f0f3328
/* f0f3304: 3c04800a */ lui $a0,%hi(var800a22c0)
/* f0f3308: 248422c0 */ addiu $a0,$a0,%lo(var800a22c0)
/* f0f3304: 3c04800a */ lui $a0,%hi(g_FilemgrLoadedMainFile)
/* f0f3308: 248422c0 */ addiu $a0,$a0,%lo(g_FilemgrLoadedMainFile)
/* f0f330c: afa80024 */ sw $t0,0x24($sp)
/* f0f3310: 0fc42539 */ jal func0f1094e4
/* f0f3314: afa9001c */ sw $t1,0x1c($sp)
@ -13944,7 +13944,7 @@ void func0f0fd548(s32 arg0)
}
GLOBAL_ASM(
glabel func0f0fd570
glabel menuIsDialogOpen
/* f0fd570: 3c028007 */ lui $v0,%hi(g_MpPlayerNum)
/* f0fd574: 8c421448 */ lw $v0,%lo(g_MpPlayerNum)($v0)
/* f0fd578: 3c0f800a */ lui $t7,%hi(g_Menus)

4
src/game/game_102240.c
View File

@ -2652,7 +2652,7 @@ s32 menudialog0010559c(u32 operation, struct menudialog *dialog, union handlerda
break;
case MENUOP_CLOSE:
if ((g_Vars.unk000458 & 1) && g_Vars.coopplayernum < 0 && g_Vars.antiplayernum < 0) {
if (func0f1094e4(&var800a22c0, 1, 0) == 0) {
if (func0f1094e4(&g_FilemgrLoadedMainFile, 1, 0) == 0) {
data->dialog1.preventclose = true;
}
@ -2753,7 +2753,7 @@ s32 menuhandlerControlStyle(u32 operation, struct menuitem *item, union handlerd
s32 menuhandler001057ec(u32 operation, struct menuitem *item, union handlerdata *data)
{
if (operation == MENUOP_SET) {
func0f1094e4(&var800a22c0, 2, 0);
func0f1094e4(&g_FilemgrLoadedMainFile, 2, 0);
}
return 0;

758
src/game/game_107fb0.c
View File

File diff suppressed because it is too large Load Diff

2
src/game/game_177e00.c
View File

@ -882,7 +882,7 @@ glabel menuhandler00178bf4
/* f178d98: 8fbf0014 */ lw $ra,0x14($sp)
.L0f178d9c:
/* f178d9c: 24040006 */ addiu $a0,$zero,0x6
/* f178da0: 0fc42947 */ jal func0f10a51c
/* f178da0: 0fc42947 */ jal filemgrPushSelectLocationDialog
/* f178da4: 24050002 */ addiu $a1,$zero,0x2
.L0f178da8:
/* f178da8: 8fbf0014 */ lw $ra,0x14($sp)

58
src/game/game_179060.c
View File

@ -546,7 +546,7 @@ s32 menuhandlerMpConfirmSaveChr(u32 operation, struct menuitem *item, union hand
{
if (operation == MENUOP_SET) {
menuPopDialog();
func0f10a51c(6, 2);
filemgrPushSelectLocationDialog(6, 2);
}
return 0;
@ -564,7 +564,7 @@ s32 menuhandlerMpPlayerName(u32 operation, struct menuitem *item, union handlerd
strcpy(g_MpSetup.name, name);
break;
case MENUOP_SET:
func0f10a51c(7, 1);
filemgrPushSelectLocationDialog(7, 1);
break;
}
@ -2846,9 +2846,9 @@ glabel var7f1b818c
/* f17baec: 0fc63703 */ jal mpGetNumUnlockedPresets
/* f17baf0: afa70038 */ sw $a3,0x38($sp)
/* f17baf4: 8fa70038 */ lw $a3,0x38($sp)
/* f17baf8: 3c038007 */ lui $v1,%hi(g_SaveLocations+0x4)
/* f17baf8: 3c038007 */ lui $v1,%hi(g_FileLists+0x4)
/* f17bafc: ace20000 */ sw $v0,0x0($a3)
/* f17bb00: 8c635bc4 */ lw $v1,%lo(g_SaveLocations+0x4)($v1)
/* f17bb00: 8c635bc4 */ lw $v1,%lo(g_FileLists+0x4)($v1)
/* f17bb04: 506000c5 */ beqzl $v1,.L0f17be1c
/* f17bb08: 00001025 */ or $v0,$zero,$zero
/* f17bb0c: 847902d0 */ lh $t9,0x2d0($v1)
@ -2858,7 +2858,7 @@ glabel var7f1b818c
/* f17bb1c: 0fc63703 */ jal mpGetNumUnlockedPresets
/* f17bb20: afa70038 */ sw $a3,0x38($sp)
/* f17bb24: 8fa70038 */ lw $a3,0x38($sp)
/* f17bb28: 3c098007 */ lui $t1,%hi(g_SaveLocations+0x4)
/* f17bb28: 3c098007 */ lui $t1,%hi(g_FileLists+0x4)
/* f17bb2c: 8ce30000 */ lw $v1,0x0($a3)
/* f17bb30: 0062082b */ sltu $at,$v1,$v0
/* f17bb34: 10200005 */ beqz $at,.L0f17bb4c
@ -2868,14 +2868,14 @@ glabel var7f1b818c
/* f17bb44: 100000b6 */ b .L0f17be20
/* f17bb48: 8fbf0014 */ lw $ra,0x14($sp)
.L0f17bb4c:
/* f17bb4c: 8d295bc4 */ lw $t1,%lo(g_SaveLocations+0x4)($t1)
/* f17bb4c: 8d295bc4 */ lw $t1,%lo(g_FileLists+0x4)($t1)
/* f17bb50: 512000b2 */ beqzl $t1,.L0f17be1c
/* f17bb54: 00001025 */ or $v0,$zero,$zero
/* f17bb58: 0fc63703 */ jal mpGetNumUnlockedPresets
/* f17bb5c: afa70038 */ sw $a3,0x38($sp)
/* f17bb60: 8fa70038 */ lw $a3,0x38($sp)
/* f17bb64: 3c0a8007 */ lui $t2,%hi(g_SaveLocations+0x4)
/* f17bb68: 8d4a5bc4 */ lw $t2,%lo(g_SaveLocations+0x4)($t2)
/* f17bb64: 3c0a8007 */ lui $t2,%hi(g_FileLists+0x4)
/* f17bb68: 8d4a5bc4 */ lw $t2,%lo(g_FileLists+0x4)($t2)
/* f17bb6c: 8ceb0000 */ lw $t3,0x0($a3)
/* f17bb70: 00027080 */ sll $t6,$v0,0x2
/* f17bb74: 01c27023 */ subu $t6,$t6,$v0
@ -2899,7 +2899,7 @@ glabel var7f1b818c
/* f17bbbc: 0fc63703 */ jal mpGetNumUnlockedPresets
/* f17bbc0: 00000000 */ nop
/* f17bbc4: 8fa70038 */ lw $a3,0x38($sp)
/* f17bbc8: 3c188007 */ lui $t8,%hi(g_SaveLocations+0x4)
/* f17bbc8: 3c188007 */ lui $t8,%hi(g_FileLists+0x4)
/* f17bbcc: 8ce30000 */ lw $v1,0x0($a3)
/* f17bbd0: 0062082b */ sltu $at,$v1,$v0
/* f17bbd4: 10200005 */ beqz $at,.L0f17bbec
@ -2909,14 +2909,14 @@ glabel var7f1b818c
/* f17bbe4: 1000001c */ b .L0f17bc58
/* f17bbe8: 8faf0034 */ lw $t7,0x34($sp)
.L0f17bbec:
/* f17bbec: 8f185bc4 */ lw $t8,%lo(g_SaveLocations+0x4)($t8)
/* f17bbec: 8f185bc4 */ lw $t8,%lo(g_FileLists+0x4)($t8)
/* f17bbf0: 53000019 */ beqzl $t8,.L0f17bc58
/* f17bbf4: 8faf0034 */ lw $t7,0x34($sp)
/* f17bbf8: 0fc63703 */ jal mpGetNumUnlockedPresets
/* f17bbfc: afa70038 */ sw $a3,0x38($sp)
/* f17bc00: 8fa70038 */ lw $a3,0x38($sp)
/* f17bc04: 3c198007 */ lui $t9,%hi(g_SaveLocations+0x4)
/* f17bc08: 8f395bc4 */ lw $t9,%lo(g_SaveLocations+0x4)($t9)
/* f17bc04: 3c198007 */ lui $t9,%hi(g_FileLists+0x4)
/* f17bc08: 8f395bc4 */ lw $t9,%lo(g_FileLists+0x4)($t9)
/* f17bc0c: 8ce80000 */ lw $t0,0x0($a3)
/* f17bc10: 00025080 */ sll $t2,$v0,0x2
/* f17bc14: 01425023 */ subu $t2,$t2,$v0
@ -2963,8 +2963,8 @@ glabel var7f1b818c
/* f17bcb0: acf90000 */ sw $t9,0x0($a3)
/* f17bcb4: 24090001 */ addiu $t1,$zero,0x1
/* f17bcb8: ace90000 */ sw $t1,0x0($a3)
/* f17bcbc: 3c038007 */ lui $v1,%hi(g_SaveLocations+0x4)
/* f17bcc0: 8c635bc4 */ lw $v1,%lo(g_SaveLocations+0x4)($v1)
/* f17bcbc: 3c038007 */ lui $v1,%hi(g_FileLists+0x4)
/* f17bcc0: 8c635bc4 */ lw $v1,%lo(g_FileLists+0x4)($v1)
/* f17bcc4: 50600055 */ beqzl $v1,.L0f17be1c
/* f17bcc8: 00001025 */ or $v0,$zero,$zero
/* f17bccc: 906b030a */ lbu $t3,0x30a($v1)
@ -2972,7 +2972,7 @@ glabel var7f1b818c
/* f17bcd4: 10000050 */ b .L0f17be18
/* f17bcd8: acec0000 */ sw $t4,0x0($a3)
/* f17bcdc: 8ce30000 */ lw $v1,0x0($a3)
/* f17bce0: 3c0e8007 */ lui $t6,%hi(g_SaveLocations+0x4)
/* f17bce0: 3c0e8007 */ lui $t6,%hi(g_FileLists+0x4)
/* f17bce4: 14600005 */ bnez $v1,.L0f17bcfc
/* f17bce8: 00000000 */ nop
/* f17bcec: 0fc5b9f1 */ jal langGet
@ -2980,12 +2980,12 @@ glabel var7f1b818c
/* f17bcf4: 1000004a */ b .L0f17be20
/* f17bcf8: 8fbf0014 */ lw $ra,0x14($sp)
.L0f17bcfc:
/* f17bcfc: 8dce5bc4 */ lw $t6,%lo(g_SaveLocations+0x4)($t6)
/* f17bcfc: 8dce5bc4 */ lw $t6,%lo(g_FileLists+0x4)($t6)
/* f17bd00: 24040001 */ addiu $a0,$zero,0x1
/* f17bd04: 8fa50030 */ lw $a1,0x30($sp)
/* f17bd08: 51c00044 */ beqzl $t6,.L0f17be1c
/* f17bd0c: 00001025 */ or $v0,$zero,$zero
/* f17bd10: 0fc421ae */ jal func0f1086b8
/* f17bd10: 0fc421ae */ jal filemgrGetDeviceNameOrStartIndex
/* f17bd14: 2466ffff */ addiu $a2,$v1,-1
/* f17bd18: 10000041 */ b .L0f17be20
/* f17bd1c: 8fbf0014 */ lw $ra,0x14($sp)
@ -2998,16 +2998,16 @@ glabel var7f1b818c
/* f17bd34: 0fc63703 */ jal mpGetNumUnlockedPresets
/* f17bd38: afa70038 */ sw $a3,0x38($sp)
/* f17bd3c: 8fa70038 */ lw $a3,0x38($sp)
/* f17bd40: 3c0f8007 */ lui $t7,%hi(g_SaveLocations+0x4)
/* f17bd40: 3c0f8007 */ lui $t7,%hi(g_FileLists+0x4)
/* f17bd44: 24040001 */ addiu $a0,$zero,0x1
/* f17bd48: ace20008 */ sw $v0,0x8($a3)
/* f17bd4c: 8def5bc4 */ lw $t7,%lo(g_SaveLocations+0x4)($t7)
/* f17bd4c: 8def5bc4 */ lw $t7,%lo(g_FileLists+0x4)($t7)
/* f17bd50: 8fa50030 */ lw $a1,0x30($sp)
/* f17bd54: 51e00031 */ beqzl $t7,.L0f17be1c
/* f17bd58: 00001025 */ or $v0,$zero,$zero
/* f17bd5c: 8ce60000 */ lw $a2,0x0($a3)
/* f17bd60: afa70038 */ sw $a3,0x38($sp)
/* f17bd64: 0fc421ae */ jal func0f1086b8
/* f17bd64: 0fc421ae */ jal filemgrGetDeviceNameOrStartIndex
/* f17bd68: 24c6ffff */ addiu $a2,$a2,-1
/* f17bd6c: 8fa70038 */ lw $a3,0x38($sp)
/* f17bd70: 8cf80008 */ lw $t8,0x8($a3)
@ -3083,8 +3083,8 @@ glabel func0f17be2c
/* f17be68: 0041082b */ sltu $at,$v0,$at
/* f17be6c: 1020004e */ beqz $at,.L0f17bfa8
/* f17be70: afa40058 */ sw $a0,0x58($sp)
/* f17be74: 3c038007 */ lui $v1,%hi(g_SaveLocations+0x4)
/* f17be78: 8c635bc4 */ lw $v1,%lo(g_SaveLocations+0x4)($v1)
/* f17be74: 3c038007 */ lui $v1,%hi(g_FileLists+0x4)
/* f17be78: 8c635bc4 */ lw $v1,%lo(g_FileLists+0x4)($v1)
/* f17be7c: 0002c080 */ sll $t8,$v0,0x2
/* f17be80: 2408ffff */ addiu $t0,$zero,-1
/* f17be84: 10600048 */ beqz $v1,.L0f17bfa8
@ -3193,8 +3193,8 @@ glabel var7f1b81a8
.word menuhandler0017bfc0+0x174 # f17c134
.text
/* f17bfc0: 27bdffb0 */ addiu $sp,$sp,-80
/* f17bfc4: 3c028007 */ lui $v0,%hi(g_SaveLocations)
/* f17bfc8: 8c425bc0 */ lw $v0,%lo(g_SaveLocations)($v0)
/* f17bfc4: 3c028007 */ lui $v0,%hi(g_FileLists)
/* f17bfc8: 8c425bc0 */ lw $v0,%lo(g_FileLists)($v0)
/* f17bfcc: afb30020 */ sw $s3,0x20($sp)
/* f17bfd0: afa50054 */ sw $a1,0x54($sp)
/* f17bfd4: 00802825 */ or $a1,$a0,$zero
@ -3230,7 +3230,7 @@ glabel var7f1b81a8
/* f17c048: 0019c8c0 */ sll $t9,$t9,0x3
/* f17c04c: 00592821 */ addu $a1,$v0,$t9
/* f17c050: 8e040000 */ lw $a0,0x0($s0)
/* f17c054: 0fc42034 */ jal func0f1080d0
/* f17c054: 0fc42034 */ jal filemgrGetFileName
/* f17c058: 24060002 */ addiu $a2,$zero,0x2
/* f17c05c: 10000048 */ b .L0f17c180
/* f17c060: 8e020000 */ lw $v0,0x0($s0)
@ -3286,7 +3286,7 @@ glabel var7f1b81a8
/* f17c11c: 10000018 */ b .L0f17c180
/* f17c120: 00001025 */ or $v0,$zero,$zero
.L0f17c124:
/* f17c124: 0fc42197 */ jal filemanPushErrorDialog
/* f17c124: 0fc42197 */ jal filemgrPushErrorDialog
/* f17c128: 24040005 */ addiu $a0,$zero,0x5
/* f17c12c: 10000014 */ b .L0f17c180
/* f17c130: 00001025 */ or $v0,$zero,$zero
@ -3298,12 +3298,12 @@ glabel var7f1b81a8
/* f17c148: 1000000c */ b .L0f17c17c
/* f17c14c: ae6b0000 */ sw $t3,0x0($s3)
/* f17c150: 00002025 */ or $a0,$zero,$zero
/* f17c154: 0fc421ae */ jal func0f1086b8
/* f17c154: 0fc421ae */ jal filemgrGetDeviceNameOrStartIndex
/* f17c158: 8e660000 */ lw $a2,0x0($s3)
/* f17c15c: 10000009 */ b .L0f17c184
/* f17c160: 8fbf002c */ lw $ra,0x2c($sp)
/* f17c164: 00002025 */ or $a0,$zero,$zero
/* f17c168: 0fc421ae */ jal func0f1086b8
/* f17c168: 0fc421ae */ jal filemgrGetDeviceNameOrStartIndex
/* f17c16c: 8e660000 */ lw $a2,0x0($s3)
/* f17c170: ae620008 */ sw $v0,0x8($s3)
/* f17c174: 10000002 */ b .L0f17c180
@ -5603,7 +5603,7 @@ s32 menuhandlerMpSavePlayer(u32 operation, struct menuitem *item, union handlerd
{
if (operation == MENUOP_SET) {
if (g_MpPlayers[g_MpPlayerNum].unk4c.unk00 == false) {
func0f10a51c(6, 2);
filemgrPushSelectLocationDialog(6, 2);
} else {
menuPushDialog(&g_MpSaveChrMenuDialog);
}

63
src/game/gamefile.c
View File

@ -29,10 +29,8 @@
#include "lib/lib_4b170.h"
#include "types.h"
struct var80075bc0 g_SaveLocations = {
NULL, NULL, NULL, NULL,
true, true, true, true,
};
struct filelist *g_FileLists[] = { NULL, NULL, NULL, NULL };
bool var80075bd0[] = { true, true, true, true };
u32 var80075be0 = 0;
u32 var80075be4 = 0;
@ -300,8 +298,8 @@ glabel func0f10fac8
/* f10fb3c: 02802025 */ or $a0,$s4,$zero
/* f10fb40: 00102600 */ sll $a0,$s0,0x18
/* f10fb44: 0004c603 */ sra $t8,$a0,0x18
/* f10fb48: 3c05800a */ lui $a1,%hi(var800a22c0)
/* f10fb4c: 8ca522c0 */ lw $a1,%lo(var800a22c0)($a1)
/* f10fb48: 3c05800a */ lui $a1,%hi(g_FilemgrLoadedMainFile)
/* f10fb4c: 8ca522c0 */ lw $a1,%lo(g_FilemgrLoadedMainFile)($a1)
/* f10fb50: 03002025 */ or $a0,$t8,$zero
/* f10fb54: 27a60050 */ addiu $a2,$sp,0x50
/* f10fb58: 0fc45a00 */ jal func0f116800
@ -570,8 +568,8 @@ glabel func0f10feac
/* f10ff18: 10000001 */ b .L0f10ff20
/* f10ff1c: 24110001 */ addiu $s1,$zero,0x1
.L0f10ff20:
/* f10ff20: 3c018007 */ lui $at,%hi(g_SaveLocations+0x10)
/* f10ff24: ac325bd0 */ sw $s2,%lo(g_SaveLocations+0x10)($at)
/* f10ff20: 3c018007 */ lui $at,%hi(g_FileLists+0x10)
/* f10ff24: ac325bd0 */ sw $s2,%lo(g_FileLists+0x10)($at)
/* f10ff28: 0fc549e0 */ jal optionsGetForwardPitch
/* f10ff2c: 02602025 */ or $a0,$s3,$zero
/* f10ff30: 3c10800a */ lui $s0,%hi(g_SoloSaveFile+0x14)
@ -1004,8 +1002,8 @@ glabel func0f10feac
/* f1105ac: ac2221f8 */ sw $v0,%lo(var800a21f8)($at)
/* f1105b0: 8fa80140 */ lw $t0,0x140($sp)
/* f1105b4: 97a90152 */ lhu $t1,0x152($sp)
/* f1105b8: 3c03800a */ lui $v1,%hi(var800a22c0)
/* f1105bc: 246322c0 */ addiu $v1,$v1,%lo(var800a22c0)
/* f1105b8: 3c03800a */ lui $v1,%hi(g_FilemgrLoadedMainFile)
/* f1105bc: 246322c0 */ addiu $v1,$v1,%lo(g_FilemgrLoadedMainFile)
/* f1105c0: 00001025 */ or $v0,$zero,$zero
/* f1105c4: ac680000 */ sw $t0,0x0($v1)
/* f1105c8: 10000003 */ b .L0f1105d8
@ -1415,11 +1413,11 @@ glabel func0f110bf8
/* f110bf8: 27bdffe0 */ addiu $sp,$sp,-32
/* f110bfc: afb10018 */ sw $s1,0x18($sp)
/* f110c00: afb00014 */ sw $s0,0x14($sp)
/* f110c04: 3c108007 */ lui $s0,%hi(g_SaveLocations)
/* f110c08: 3c118007 */ lui $s1,%hi(g_SaveLocations+0x10)
/* f110c04: 3c108007 */ lui $s0,%hi(g_FileLists)
/* f110c08: 3c118007 */ lui $s1,%hi(g_FileLists+0x10)
/* f110c0c: afbf001c */ sw $ra,0x1c($sp)
/* f110c10: 26315bd0 */ addiu $s1,$s1,%lo(g_SaveLocations+0x10)
/* f110c14: 26105bc0 */ addiu $s0,$s0,%lo(g_SaveLocations)
/* f110c10: 26315bd0 */ addiu $s1,$s1,%lo(g_FileLists+0x10)
/* f110c14: 26105bc0 */ addiu $s0,$s0,%lo(g_FileLists)
/* f110c18: 8e0e0000 */ lw $t6,0x0($s0)
.L0f110c1c:
/* f110c1c: 51c00008 */ beqzl $t6,.L0f110c40
@ -1441,15 +1439,18 @@ glabel func0f110bf8
/* f110c58: 27bd0020 */ addiu $sp,$sp,0x20
);
void func0f110c5c(s32 locationindex, u8 filetype)
/**
* Allocate and build a file list.
*/
void func0f110c5c(s32 listnum, u8 filetype)
{
if (g_SaveLocations.locations[locationindex] == NULL) {
func0f15e5b8(align16(sizeof(struct savelocation)), 1);
g_SaveLocations.locations[locationindex] = func00012ab0(align16(sizeof(struct savelocation)));
if (g_FileLists[listnum] == NULL) {
func0f15e5b8(align16(sizeof(struct filelist)), 1);
g_FileLists[listnum] = func00012ab0(align16(sizeof(struct filelist)));
}
g_SaveLocations.locations[locationindex]->unk30c = 1;
g_SaveLocations.locations[locationindex]->filetype = filetype;
g_FileLists[listnum]->outdated = true;
g_FileLists[listnum]->filetype = filetype;
if (var80062944 == 0) {
func0001398c(3);
@ -1464,10 +1465,10 @@ glabel func0f110cf8
/* f110cfc: afb00018 */ sw $s0,0x18($sp)
/* f110d00: 309000ff */ andi $s0,$a0,0xff
/* f110d04: afa40028 */ sw $a0,0x28($sp)
/* f110d08: 3c058007 */ lui $a1,%hi(g_SaveLocations)
/* f110d08: 3c058007 */ lui $a1,%hi(g_FileLists)
/* f110d0c: afbf001c */ sw $ra,0x1c($sp)
/* f110d10: 2406ffff */ addiu $a2,$zero,-1
/* f110d14: 24a55bc0 */ addiu $a1,$a1,%lo(g_SaveLocations)
/* f110d14: 24a55bc0 */ addiu $a1,$a1,%lo(g_FileLists)
/* f110d18: 24040004 */ addiu $a0,$zero,0x4
/* f110d1c: 00001825 */ or $v1,$zero,$zero
/* f110d20: 2407ffff */ addiu $a3,$zero,-1
@ -1571,12 +1572,12 @@ glabel func0f110da8
/* f110e68: 2a410005 */ slti $at,$s2,0x5
/* f110e6c: 5420ffe6 */ bnezl $at,.L0f110e08
/* f110e70: 00128e00 */ sll $s1,$s2,0x18
/* f110e74: 3c108007 */ lui $s0,%hi(g_SaveLocations)
/* f110e78: 3c148007 */ lui $s4,%hi(g_SaveLocations+0x10)
/* f110e7c: 3c118007 */ lui $s1,%hi(g_SaveLocations+0x10)
/* f110e80: 26315bd0 */ addiu $s1,$s1,%lo(g_SaveLocations+0x10)
/* f110e84: 26945bd0 */ addiu $s4,$s4,%lo(g_SaveLocations+0x10)
/* f110e88: 26105bc0 */ addiu $s0,$s0,%lo(g_SaveLocations)
/* f110e74: 3c108007 */ lui $s0,%hi(g_FileLists)
/* f110e78: 3c148007 */ lui $s4,%hi(g_FileLists+0x10)
/* f110e7c: 3c118007 */ lui $s1,%hi(g_FileLists+0x10)
/* f110e80: 26315bd0 */ addiu $s1,$s1,%lo(g_FileLists+0x10)
/* f110e84: 26945bd0 */ addiu $s4,$s4,%lo(g_FileLists+0x10)
/* f110e88: 26105bc0 */ addiu $s0,$s0,%lo(g_FileLists)
/* f110e8c: 24120001 */ addiu $s2,$zero,0x1
/* f110e90: 8e040000 */ lw $a0,0x0($s0)
.L0f110e94:
@ -1615,10 +1616,10 @@ glabel func0f110da8
/* f110f04: 0214082b */ sltu $at,$s0,$s4
/* f110f08: 5420ffe2 */ bnezl $at,.L0f110e94
/* f110f0c: 8e040000 */ lw $a0,0x0($s0)
/* f110f10: 3c028007 */ lui $v0,%hi(g_SaveLocations+0x10)
/* f110f10: 3c028007 */ lui $v0,%hi(g_FileLists+0x10)
/* f110f14: 3c038007 */ lui $v1,%hi(var80075be0)
/* f110f18: 24635be0 */ addiu $v1,$v1,%lo(var80075be0)
/* f110f1c: 24425bd0 */ addiu $v0,$v0,%lo(g_SaveLocations+0x10)
/* f110f1c: 24425bd0 */ addiu $v0,$v0,%lo(g_FileLists+0x10)
.L0f110f20:
/* f110f20: 24420004 */ addiu $v0,$v0,0x4
/* f110f24: 1443fffe */ bne $v0,$v1,.L0f110f20
@ -2029,7 +2030,7 @@ glabel func0f111460
/* f1114fc: 02002025 */ or $a0,$s0,$zero
/* f111500: afa5003c */ sw $a1,0x3c($sp)
/* f111504: afa80030 */ sw $t0,0x30($sp)
/* f111508: 0fc479ac */ jal func0f11e6b0
/* f111508: 0fc479ac */ jal pakSearch
/* f11150c: afaa0024 */ sw $t2,0x24($sp)
/* f111510: 00022600 */ sll $a0,$v0,0x18
/* f111514: 00045e03 */ sra $t3,$a0,0x18

8
src/game/mplayer.c
View File

@ -6754,9 +6754,9 @@ glabel func0f18d9fc
/* f18da2c: 0fc35531 */ jal func0f0d54c4
/* f18da30: 27a40020 */ addiu $a0,$sp,0x20
/* f18da34: 240f0001 */ addiu $t7,$zero,0x1
/* f18da38: 3c018007 */ lui $at,%hi(g_SaveLocations+0x18)
/* f18da38: 3c018007 */ lui $at,%hi(g_FileLists+0x18)
/* f18da3c: 27b80100 */ addiu $t8,$sp,0x100
/* f18da40: ac2f5bd8 */ sw $t7,%lo(g_SaveLocations+0x18)($at)
/* f18da40: ac2f5bd8 */ sw $t7,%lo(g_FileLists+0x18)($at)
/* f18da44: afb80010 */ sw $t8,0x10($sp)
/* f18da48: 83a4010f */ lb $a0,0x10f($sp)
/* f18da4c: 8fa50110 */ lw $a1,0x110($sp)
@ -7439,10 +7439,10 @@ glabel func0f18e420
/* f18e468: 0fc45a0a */ jal func0f116828
/* f18e46c: afa00014 */ sw $zero,0x14($sp)
/* f18e470: 24180001 */ addiu $t8,$zero,0x1
/* f18e474: 3c018007 */ lui $at,%hi(g_SaveLocations+0x14)
/* f18e474: 3c018007 */ lui $at,%hi(g_FileLists+0x14)
/* f18e478: 00401825 */ or $v1,$v0,$zero
/* f18e47c: 14400009 */ bnez $v0,.L0f18e4a4
/* f18e480: ac385bd4 */ sw $t8,%lo(g_SaveLocations+0x14)($at)
/* f18e480: ac385bd4 */ sw $t8,%lo(g_FileLists+0x14)($at)
/* f18e484: 8fb90100 */ lw $t9,0x100($sp)
/* f18e488: 97a80112 */ lhu $t0,0x112($sp)
/* f18e48c: 3c03800b */ lui $v1,%hi(g_MpSetup)

8
src/game/pak/pak.c
View File

@ -527,7 +527,7 @@ glabel func0f116828
);
GLOBAL_ASM(
glabel func0f116860
glabel filemgrDeleteFile
/* f116860: 27bdffe8 */ addiu $sp,$sp,-24
/* f116864: afbf0014 */ sw $ra,0x14($sp)
/* f116868: afa40018 */ sw $a0,0x18($sp)
@ -3301,8 +3301,8 @@ glabel func0f1189d8
/* f118aa4: 02002025 */ or $a0,$s0,$zero
/* f118aa8: 0fc43c81 */ jal savefileApplyOptions
/* f118aac: 02002025 */ or $a0,$s0,$zero
/* f118ab0: 3c01800a */ lui $at,%hi(var800a22c0+0x4)
/* f118ab4: a42022c4 */ sh $zero,%lo(var800a22c0+0x4)($at)
/* f118ab0: 3c01800a */ lui $at,%hi(g_FilemgrLoadedMainFile+0x4)
/* f118ab4: a42022c4 */ sh $zero,%lo(g_FilemgrLoadedMainFile+0x4)($at)
/* f118ab8: 8fbf001c */ lw $ra,0x1c($sp)
/* f118abc: 3c01800a */ lui $at,%hi(g_Vars+0x4e4)
/* f118ac0: 240c00f5 */ addiu $t4,$zero,0xf5
@ -11090,7 +11090,7 @@ glabel func0f11e618
);
GLOBAL_ASM(
glabel func0f11e6b0
glabel pakSearch
/* f11e6b0: 27bdffd0 */ addiu $sp,$sp,-48
/* f11e6b4: afb40028 */ sw $s4,0x28($sp)
/* f11e6b8: afb30024 */ sw $s3,0x24($sp)

6
src/game/training.c
View File

@ -2563,8 +2563,8 @@ glabel var7f1b94e4
/* f19fbc0: 2484907c */ addiu $a0,$a0,%lo(g_MenuDialogFrTrainingStatsCompleted)
/* f19fbc4: 0fc3e178 */ jal func0f0f85e0
/* f19fbc8: 2405000d */ addiu $a1,$zero,0xd
/* f19fbcc: 3c04800a */ lui $a0,%hi(var800a22c0)
/* f19fbd0: 248422c0 */ addiu $a0,$a0,%lo(var800a22c0)
/* f19fbcc: 3c04800a */ lui $a0,%hi(g_FilemgrLoadedMainFile)
/* f19fbd0: 248422c0 */ addiu $a0,$a0,%lo(g_FilemgrLoadedMainFile)
/* f19fbd4: 00002825 */ or $a1,$zero,$zero
/* f19fbd8: 0fc42539 */ jal func0f1094e4
/* f19fbdc: 00003025 */ or $a2,$zero,$zero
@ -3572,7 +3572,7 @@ glabel var7f1b94e4
// case FRMENUTYPE_COMPLETED:
// audioStart(var80095200, 0x5dc, NULL, -1, -1, -1, -1, -1);
// func0f0f85e0(&g_MenuDialogFrTrainingStatsCompleted, MENUROOT_TRAINING);
// func0f1094e4(&var800a22c0, 0, 0);
// func0f1094e4(&g_FilemgrLoadedMainFile, 0, 0);
// break;
// }
// }

6
src/gvars/gvars.c
View File

@ -14898,13 +14898,13 @@ u32 g_CheatsActiveBank0 = 0;
u32 g_CheatsActiveBank1 = 0;
u32 g_CheatsEnabledBank0 = 0;
u32 g_CheatsEnabledBank1 = 0;
struct savelocation_2d8 var800a21e0 = {0};
struct savelocation_2d8 g_FilemgrFileToCopy = {0};
struct savelocation_2d8 var800a21e8 = {0};
struct savelocation_2d8 var800a21f0 = {0};
struct savelocation_2d8 g_FilemgrFileToDelete = {0};
struct savelocation_2d8 var800a21f8 = {0};
struct savefile_solo g_SoloSaveFile = {0};
u32 var800a22bc = 0;
struct savelocation_2d8 var800a22c0 = {0};
struct savelocation_2d8 g_FilemgrLoadedMainFile = {0};
u32 var800a22c8 = 0;
u32 var800a22cc = 0;
u32 var800a22d0 = 0;

1
src/include/constants.h
View File

@ -2504,6 +2504,7 @@
#define SAVEDEVICE_CONTROLLERPAK3 2
#define SAVEDEVICE_CONTROLLERPAK4 3
#define SAVEDEVICE_GAMEPAK 4
#define SAVEDEVICE_INVALID 5
#define SAVEFILEFLAG_P1_FORWARDPITCH 0x00
#define SAVEFILEFLAG_P1_AUTOAIM 0x01

34
src/include/game/data/data_01a3a0.h
View File

@ -2,30 +2,30 @@
#define IN_GAME_DATA_01A3A0_H
#include <ultra64.h>
extern struct menudialog g_FilemanErrorMenuDialog;
extern struct menudialog g_FilemgrErrorMenuDialog;
extern u16 savelocations2[];
extern u16 iomessages2[];
extern u16 filetypenames[];
extern struct menudialog g_FilemanFileSavedMenuDialog;
extern struct menudialog g_FilemanSaveErrorMenuDialog;
extern struct menudialog g_FilemanFileLostMenuDialog;
extern struct menudialog g_FilemanSaveElsewhereMenuDialog;
extern struct menudialog g_FilemanInsertOriginalPakMenuDialog;
extern struct menudialog g_FilemgrFileSavedMenuDialog;
extern struct menudialog g_FilemgrSaveErrorMenuDialog;
extern struct menudialog g_FilemgrFileLostMenuDialog;
extern struct menudialog g_FilemgrSaveElsewhereMenuDialog;
extern struct menudialog g_FilemgrInsertOriginalPakMenuDialog;
extern u32 var8007464c;
extern struct menudialog g_FilemanChangeFileNameMenuDialog;
extern struct menudialog g_FilemanDuplicateFileNameMenuDialog;
extern struct menudialog g_FilemgrChangeFileNameMenuDialog;
extern struct menudialog g_FilemgrDuplicateFileNameMenuDialog;
extern u16 savelocations3[];
extern struct menudialog g_FilemanSelectLocationMenuDialog;
extern struct menudialog g_FilemanConfirmDeleteMenuDialog;
extern struct menudialog g_FilemanFileInUseMenuDialog;
extern struct menudialog g_FilemanDeleteFileMenuDialog;
extern struct menudialog g_FilemanCopyListMenuDialog;
extern struct menudialog g_FilemgrSelectLocationMenuDialog;
extern struct menudialog g_FilemgrConfirmDeleteMenuDialog;
extern struct menudialog g_FilemgrFileInUseMenuDialog;
extern struct menudialog g_FilemgrDeleteFileMenuDialog;
extern struct menudialog g_FilemgrCopyListMenuDialog;
extern struct pakdata *g_EditingPak;
extern struct menudialog g_PakDeleteGameNoteMenuDialog;
extern struct menudialog g_PakGameNotesMenuDialog;
extern struct menudialog g_PakChoosePakMenuDialog;
extern struct menudialog g_FilemanEnterAgentNameMenuDialog;
extern struct menudialog g_FilemanMainMenuDialog;
extern struct menudialog g_FilemgrEnterAgentNameMenuDialog;
extern struct menudialog g_FilemgrMainMenuDialog;
extern struct menudialog menudialog_fileselect2;
extern struct menudialog menudialog_mpquickgo2;
extern struct menudialog menudialog_1b1bc;
@ -33,8 +33,8 @@ extern struct menudialog g_4MbMainMenu;
extern struct menudialog menudialog_mpdropout;
extern struct menudialog g_MpEditSimulant4MbMenuDialog;
extern struct menudialog g_4MbAdvancedSetupMenuDialog;
extern struct var80075bc0 g_SaveLocations;
extern u32 var80075bd0;
extern struct filelist *g_FileLists[4];
extern bool var80075bd0[4];
extern u32 var80075be0;
extern struct var80075c00 var80075c00[];
extern u32 var80075c30;

2
src/include/game/game_0f09f0.h
View File

@ -81,7 +81,7 @@ bool func0f0fd1f4(u32 arg0, u32 arg1);
u32 func0f0fd320(void);
void func0f0fd494(struct coord *pos);
void func0f0fd548(s32 arg0);
bool func0f0fd570(struct menudialog *dialog);
bool menuIsDialogOpen(struct menudialog *dialog);
bool currentPlayerGetUnk1c04(void);
extern const char var7f1b2658[];

106
src/include/game/game_107fb0.h
View File

@ -3,80 +3,80 @@
#include <ultra64.h>
#include "types.h"
char *filemanGetDeviceName(s32 index);
char *filemanMenuTextDeviceName(struct menuitem *item);
void func0f1080d0(char *buffer, struct savelocation000 *arg1, u32 arg2);
char *filemanMenuTextDeleteFileName(struct menuitem *item);
char *filemgrGetDeviceName(s32 index);
char *filemgrMenuTextDeviceName(struct menuitem *item);
void filemgrGetFileName(char *buffer, struct savelocation000 *arg1, u32 filetype);
char *filemgrMenuTextDeleteFileName(struct menuitem *item);
void func0f108324(s32 arg0);
void func0f1083b0(struct savelocation000 *arg0);
void func0f1083d0(struct savelocation000 *arg0, s32 filetype);
char *filemanMenuTextFailReason(struct menuitem *item);
char *filemanMenuTextDeviceNameForError(struct menuitem *item);
void filemanPushErrorDialog(u16 errno);
s32 func0f1086b8(s32 arg0, s32 arg1, s32 arg2);
char *filemanMenuTextErrorTitle(struct menuitem *item);
char *filemanMenuTextFileType(struct menuitem *item);
char *filemgrMenuTextFailReason(struct menuitem *item);
char *filemgrMenuTextDeviceNameForError(struct menuitem *item);
void filemgrPushErrorDialog(u16 errno);
s32 filemgrGetDeviceNameOrStartIndex(s32 listnum, s32 operation, s32 optionindex);
char *filemgrMenuTextErrorTitle(struct menuitem *item);
char *filemgrMenuTextFileType(struct menuitem *item);
void func0f10898c(void);
void func0f108a80(void);
void filemanEraseCorruptFile(void);
char *filemanMenuTextInsertOriginalPak(struct menuitem *item);
void func0f109038(s32 arg0);
void filemgrEraseCorruptFile(void);
char *filemgrMenuTextInsertOriginalPak(struct menuitem *item);
void filemgrRetrySave(s32 arg0);
bool fileSave(s32 arg0, bool arg1);
bool func0f1094e4(struct savelocation_2d8 *arg0, s32 arg1, void *arg2);
void filemanDeleteFile(void);
void filemgrDeleteCurrentFile(void);
void func0f1097d0(s32 device);
void func0f109954(s32 arg0);
void func0f1099a8(char *buffer, struct savelocation000 *arg1);
void func0f109a68(char *buffer);
void func0f109bb4(char *name);
bool func0f109c8c(s32 arg0);
void filemgrGetRenameName(char *buffer);
void filemgrSetRenameName(char *name);
bool filemgrIsNameAvailable(s32 arg0);
void func0f109ec4(void);
char *filemanMenuTextDeviceNameContainingDuplicateFile(struct menuitem *item);
char *filemanMenuTextDuplicateFileName(struct menuitem *item);
char *filemanMenuTextLocationName2(struct menuitem *item);
char *filemanMenuTextSaveLocationSpaces(struct menuitem *item);
void func0f10a51c(s32 arg0, u32 arg1);
char *filemanMenuTextFileInUseDescription(struct menuitem *item);
Gfx *filemanRenderPerfectHeadThumbnail(Gfx *gdl, struct menuitemrenderdata *renderdata, u32 arg2, u32 arg3);
bool func0f10a97c(struct savelocation000 *arg0);
s32 filemanFileToCopyOrDeleteListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data, bool isdelete);
void filemanPushDeleteFileDialog(u32 arg0);
char *filemgrMenuTextDeviceNameContainingDuplicateFile(struct menuitem *item);
char *filemgrMenuTextDuplicateFileName(struct menuitem *item);
char *filemgrMenuTextLocationName2(struct menuitem *item);
char *filemgrMenuTextSaveLocationSpaces(struct menuitem *item);
void filemgrPushSelectLocationDialog(s32 arg0, u32 arg1);
char *filemgrMenuTextFileInUseDescription(struct menuitem *item);
Gfx *filemgrRenderPerfectHeadThumbnail(Gfx *gdl, struct menuitemrenderdata *renderdata, u32 arg2, u32 arg3);
bool filemgrIsFileInUse(struct savelocation000 *arg0);
s32 filemgrFileToCopyOrDeleteListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data, bool isdelete);
void filemgrPushDeleteFileDialog(s32 listnum);
char *pakMenuTextPagesFree(struct menuitem *item);
char *pakMenuTextPagesUsed(struct menuitem *item);
char *pakMenuTextStatusMessage(struct menuitem *item);
char *pakMenuTextEditingPakName(struct menuitem *item);
bool filemanConsiderPushingFileSelectDialog(void);
bool filemgrConsiderPushingFileSelectDialog(void);
void pakPushPakMenuDialog(void);
s32 filemanChooseAgentListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrChooseAgentListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 pakGameNoteListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanFileToCopyListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanFileToDeleteListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanInsertOriginalPakMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data);
s32 filemanCopyOrDeleteListMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data);
s32 filemgrFileToCopyListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrFileToDeleteListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrInsertOriginalPakMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data);
s32 filemgrCopyOrDeleteListMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data);
s32 pakGameNotesMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data);
s32 pakChoosePakMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data);
s32 filemanMainMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data);
s32 filemanDeviceNameMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanFileNameMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanDeviceNameForErrorMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanRetrySaveMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanCancelSave2MenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanAcknowledgeFileLostMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanReinsertedOkMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanReinsertedCancelMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanDuplicateRenameMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanDuplicateCancelMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanCancelSaveMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanDeleteFilesForSaveMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanConfirmDeleteMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrMainMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data);
s32 filemgrDeviceNameMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrFileNameMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrDeviceNameForErrorMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrRetrySaveMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrCancelSave2MenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrAcknowledgeFileLostMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrReinsertedOkMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrReinsertedCancelMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrDuplicateRenameMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrDuplicateCancelMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrCancelSaveMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrDeleteFilesForSaveMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrConfirmDeleteMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 pakDeleteGameNoteMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 pakSelectionMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanAgentNameKeyboardMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanOpenCopyFileMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanOpenDeleteFileMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanConfirmRenameMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanSaveElsewhereYesMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemanSelectLocationMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrAgentNameKeyboardMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrOpenCopyFileMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrOpenDeleteFileMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrConfirmRenameMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrSaveElsewhereYesMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 filemgrSelectLocationMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
extern const char var7f1b3214[];
extern const char var7f1b3218[];

2
src/include/game/gamefile.h
View File

@ -19,7 +19,7 @@ void func0f1109c0(void);
void func0f110b68(void);
void func0f110bf0(void);
void func0f110bf8(void);
void func0f110c5c(s32 locationindex, u8 filetype);
void func0f110c5c(s32 listnum, u8 filetype);
u8 func0f110cf8(u8 arg0);
u32 func0f110d90(void);
void func0f110da8(void);

4
src/include/game/pak/pak.h
View File

@ -13,7 +13,7 @@ u32 func0f1167b0(void);
u32 func0f1167d8(s8 arg0);
s32 func0f116800(s8 arg0, s32 arg1, void *arg2, s32 arg3);
s32 func0f116828(s8 arg0, s32 arg1, s32 arg2, void *arg3, s32 *arg4, s32 arg5);
bool func0f116860(s8 arg0, s32 arg1);
bool filemgrDeleteFile(s8 arg0, s32 arg1);
s32 pakDeleteGameNote(s8 device, u16 company_code, u32 game_code, char *game_name, char *ext_name);
s32 func0f1168c4(s8 device, struct pakdata **arg1);
u32 func0f116914(void);
@ -129,7 +129,7 @@ void bitSetByIndex(u32 value, u32 *flags, bool set);
u32 bitGetByIndex(u32 value, u32 *flags);
void func0f11e5bc(u32 *flags);
void func0f11e618(char *src, char *dst, u32 len);
s8 func0f11e6b0(s32 arg0);
s8 pakSearch(s32 arg0);
u32 func0f11e750(void);
u32 func0f11e78c(void);
u32 func0f11e7f0(void);

6
src/include/gvars/gvars.h
View File

@ -659,12 +659,12 @@ extern u32 g_CheatsActiveBank0;
extern u32 g_CheatsActiveBank1;
extern u32 g_CheatsEnabledBank0;
extern u32 g_CheatsEnabledBank1;
extern struct savelocation_2d8 var800a21e0;
extern struct savelocation_2d8 g_FilemgrFileToCopy;
extern struct savelocation_2d8 var800a21e8;
extern struct savelocation_2d8 var800a21f0;
extern struct savelocation_2d8 g_FilemgrFileToDelete;
extern struct savelocation_2d8 var800a21f8;
extern struct savefile_solo g_SoloSaveFile;
extern struct savelocation_2d8 var800a22c0;
extern struct savelocation_2d8 g_FilemgrLoadedMainFile;
extern u32 var800a22d0;
extern u8 var800a2328[4];
extern u8 g_AltTitle;

207
src/include/types.h
View File

@ -3863,12 +3863,12 @@ struct menudata_mpend {
u32 unke1c;
};
// Not sure if fileman and pak are the same struct
struct menudata_fileman {
// Not sure if filemgr and pak are the same struct
struct menudata_filemgr {
u32 filetypeplusone;
u32 device;
u32 unke24;
u32 unke28;
u32 isdeletingforsave;
u32 unke2c;
};
@ -4493,7 +4493,7 @@ struct menu {
struct menudata_mpsetup mpsetup;
struct menudata_mppause mppause;
struct menudata_mpend mpend;
struct menudata_fileman fileman;
struct menudata_filemgr filemgr;
struct menudata_pak pak;
struct menudata_main4mb main4mb;
struct menudata_train train;
@ -4505,15 +4505,15 @@ struct menu {
/*0xe3c*/ u8 unke3c;
/*0xe3d*/ u8 unke3d;
/*0xe3e*/ u8 unke3e;
/*0xe3f*/ u8 unke3f;
/*0xe3f*/ u8 listnum;
/*0xe40*/ u8 unke40;
/*0xe41*/ u8 unke41;
/*0xe42*/ u8 unke42;
/*0xe44*/ void *unke44;
/*0xe48*/ u32 unke48;
/*0xe4c*/ u32 unke4c;
/*0xe50*/ u16 unke50;
/*0xe52*/ u8 unke52;
/*0xe50*/ u16 isretryingsave;
/*0xe52*/ u8 device;
/*0xe53*/ char unke53[1];
/*0xe54*/ u32 unke54;
/*0xe58*/ u32 unke58;
@ -4711,203 +4711,26 @@ struct savelocation000 {
u32 unk14;
};
struct savelocation {
/*0x000*/ struct savelocation000 unk000[1];
/*0x018*/ u32 unk018;
/*0x01c*/ u32 unk01c;
/*0x020*/ u32 unk020;
/*0x024*/ u32 unk024;
/*0x028*/ u32 unk028;
/*0x02c*/ u32 unk02c;
/*0x030*/ u32 unk030;
/*0x034*/ u32 unk034;
/*0x038*/ u32 unk038;
/*0x03c*/ u32 unk03c;
/*0x040*/ u32 unk040;
/*0x044*/ u32 unk044;
/*0x048*/ u32 unk048;
/*0x04c*/ u32 unk04c;
/*0x050*/ u32 unk050;
/*0x054*/ u32 unk054;
/*0x058*/ u32 unk058;
/*0x05c*/ u32 unk05c;
/*0x060*/ u32 unk060;
/*0x064*/ u32 unk064;
/*0x068*/ u32 unk068;
/*0x06c*/ u32 unk06c;
/*0x070*/ u32 unk070;
/*0x074*/ u32 unk074;
/*0x078*/ u32 unk078;
/*0x07c*/ u32 unk07c;
/*0x080*/ u32 unk080;
/*0x084*/ u32 unk084;
/*0x088*/ u32 unk088;
/*0x08c*/ u32 unk08c;
/*0x090*/ u32 unk090;
/*0x094*/ u32 unk094;
/*0x098*/ u32 unk098;
/*0x09c*/ u32 unk09c;
/*0x0a0*/ u32 unk0a0;
/*0x0a4*/ u32 unk0a4;
/*0x0a8*/ u32 unk0a8;
/*0x0ac*/ u32 unk0ac;
/*0x0b0*/ u32 unk0b0;
/*0x0b4*/ u32 unk0b4;
/*0x0b8*/ u32 unk0b8;
/*0x0bc*/ u32 unk0bc;
/*0x0c0*/ u32 unk0c0;
/*0x0c4*/ u32 unk0c4;
/*0x0c8*/ u32 unk0c8;
/*0x0cc*/ u32 unk0cc;
/*0x0d0*/ u32 unk0d0;
/*0x0d4*/ u32 unk0d4;
/*0x0d8*/ u32 unk0d8;
/*0x0dc*/ u32 unk0dc;
/*0x0e0*/ u32 unk0e0;
/*0x0e4*/ u32 unk0e4;
/*0x0e8*/ u32 unk0e8;
/*0x0ec*/ u32 unk0ec;
/*0x0f0*/ u32 unk0f0;
/*0x0f4*/ u32 unk0f4;
/*0x0f8*/ u32 unk0f8;
/*0x0fc*/ u32 unk0fc;
/*0x100*/ u32 unk100;
/*0x104*/ u32 unk104;
/*0x108*/ u32 unk108;
/*0x10c*/ u32 unk10c;
/*0x110*/ u32 unk110;
/*0x114*/ u32 unk114;
/*0x118*/ u32 unk118;
/*0x11c*/ u32 unk11c;
/*0x120*/ u32 unk120;
/*0x124*/ u32 unk124;
/*0x128*/ u32 unk128;
/*0x12c*/ u32 unk12c;
/*0x130*/ u32 unk130;
/*0x134*/ u32 unk134;
/*0x138*/ u32 unk138;
/*0x13c*/ u32 unk13c;
/*0x140*/ u32 unk140;
/*0x144*/ u32 unk144;
/*0x148*/ u32 unk148;
/*0x14c*/ u32 unk14c;
/*0x150*/ u32 unk150;
/*0x154*/ u32 unk154;
/*0x158*/ u32 unk158;
/*0x15c*/ u32 unk15c;
/*0x160*/ u32 unk160;
/*0x164*/ u32 unk164;
/*0x168*/ u32 unk168;
/*0x16c*/ u32 unk16c;
/*0x170*/ u32 unk170;
/*0x174*/ u32 unk174;
/*0x178*/ u32 unk178;
/*0x17c*/ u32 unk17c;
/*0x180*/ u32 unk180;
/*0x184*/ u32 unk184;
/*0x188*/ u32 unk188;
/*0x18c*/ u32 unk18c;
/*0x190*/ u32 unk190;
/*0x194*/ u32 unk194;
/*0x198*/ u32 unk198;
/*0x19c*/ u32 unk19c;
/*0x1a0*/ u32 unk1a0;
/*0x1a4*/ u32 unk1a4;
/*0x1a8*/ u32 unk1a8;
/*0x1ac*/ u32 unk1ac;
/*0x1b0*/ u32 unk1b0;
/*0x1b4*/ u32 unk1b4;
/*0x1b8*/ u32 unk1b8;
/*0x1bc*/ u32 unk1bc;
/*0x1c0*/ u32 unk1c0;
/*0x1c4*/ u32 unk1c4;
/*0x1c8*/ u32 unk1c8;
/*0x1cc*/ u32 unk1cc;
/*0x1d0*/ u32 unk1d0;
/*0x1d4*/ u32 unk1d4;
/*0x1d8*/ u32 unk1d8;
/*0x1dc*/ u32 unk1dc;
/*0x1e0*/ u32 unk1e0;
/*0x1e4*/ u32 unk1e4;
/*0x1e8*/ u32 unk1e8;
/*0x1ec*/ u32 unk1ec;
/*0x1f0*/ u32 unk1f0;
/*0x1f4*/ u32 unk1f4;
/*0x1f8*/ u32 unk1f8;
/*0x1fc*/ u32 unk1fc;
/*0x200*/ u32 unk200;
/*0x204*/ u32 unk204;
/*0x208*/ u32 unk208;
/*0x20c*/ u32 unk20c;
/*0x210*/ u32 unk210;
/*0x214*/ u32 unk214;
/*0x218*/ u32 unk218;
/*0x21c*/ u32 unk21c;
/*0x220*/ u32 unk220;
/*0x224*/ u32 unk224;
/*0x228*/ u32 unk228;
/*0x22c*/ u32 unk22c;
/*0x230*/ u32 unk230;
/*0x234*/ u32 unk234;
/*0x238*/ u32 unk238;
/*0x23c*/ u32 unk23c;
/*0x240*/ u32 unk240;
/*0x244*/ u32 unk244;
/*0x248*/ u32 unk248;
/*0x24c*/ u32 unk24c;
/*0x250*/ u32 unk250;
/*0x254*/ u32 unk254;
/*0x258*/ u32 unk258;
/*0x25c*/ u32 unk25c;
/*0x260*/ u32 unk260;
/*0x264*/ u32 unk264;
/*0x268*/ u32 unk268;
/*0x26c*/ u32 unk26c;
/*0x270*/ u32 unk270;
/*0x274*/ u32 unk274;
/*0x278*/ u32 unk278;
/*0x27c*/ u32 unk27c;
/*0x280*/ u32 unk280;
/*0x284*/ u32 unk284;
/*0x288*/ u32 unk288;
/*0x28c*/ u32 unk28c;
/*0x290*/ u32 unk290;
/*0x294*/ u32 unk294;
/*0x298*/ u32 unk298;
/*0x29c*/ u32 unk29c;
/*0x2a0*/ u32 unk2a0;
/*0x2a4*/ u32 unk2a4;
/*0x2a8*/ u32 unk2a8;
/*0x2ac*/ u32 unk2ac;
/*0x2b0*/ u32 unk2b0;
/*0x2b4*/ u32 unk2b4;
/*0x2b8*/ u32 unk2b8;
/*0x2bc*/ u32 unk2bc;
/*0x2c0*/ u32 unk2c0;
/*0x2c4*/ u32 unk2c4;
/*0x2c8*/ u32 unk2c8;
/*0x2cc*/ u32 unk2cc;
/*0x2d0*/ s16 unk2d0;
// This stores information about all files of a particular filetype across all
// devices. For example, the copy file dialog might list all MP player files
// from all devices in one listing, and that information is stored here.
struct filelist {
/*0x000*/ struct savelocation000 unk000[30];
/*0x2d0*/ s16 numfiles;
/*0x2d2*/ s8 spacesfree[4];
/*0x2d8*/ struct savelocation_2d8 unk2d8[4];
/*0x2f8*/ u32 unk2f8;
/*0x2fc*/ u32 unk2fc;
/*0x300*/ s8 unk300[4];
/*0x304*/ u32 unk304;
/*0x300*/ s8 devicestartindexes[8];
/*0x308*/ u8 unk308;
/*0x309*/ u8 unk309;
/*0x30a*/ u8 unk30a;
/*0x30b*/ u8 filetype;
/*0x30c*/ u8 unk30c; // inuse?
/*0x30c*/ u8 outdated;
/*0x30d*/ u8 unk30d;
/*0x30e*/ u8 unk30e;
};
struct var80075bc0 {
struct savelocation *locations[4];
bool unk10[4];
};
struct challenge {
/*0x00*/ u16 name;
/*0x02*/ s16 confignum;