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

Rename many fileman functions and menu dialogs

This commit is contained in:
Ryan Dwyer 2020-11-07 16:07:59 +10:00
parent cd4c54d86f
commit 244d63faac
11 changed files with 381 additions and 423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,16 +23,16 @@
// 1ae10
struct menuitem menuitems_gamefiles2[] = {
{ MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(100), 0x00000000, NULL }, // "Copy:"
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(103), 0x00000000, menuhandlerOpenCopyFile }, // "Single Player Agent File"
{ MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(104), 0x00000000, menuhandlerOpenCopyFile }, // "Combat Simulator Settings File"
{ MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS(105), 0x00000000, menuhandlerOpenCopyFile }, // "Combat Simulator Player File"
{ 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_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
{ MENUITEMTYPE_LABEL, 0, 0x00004010, L_OPTIONS(101), 0x00000000, NULL }, // "Delete:"
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000000, L_OPTIONS(103), 0x00000000, menuhandlerOpenDeleteFile }, // "Single Player Agent File"
{ MENUITEMTYPE_SELECTABLE, 1, 0x00000000, L_OPTIONS(104), 0x00000000, menuhandlerOpenDeleteFile }, // "Combat Simulator Settings File"
{ MENUITEMTYPE_SELECTABLE, 2, 0x00000000, L_OPTIONS(105), 0x00000000, menuhandlerOpenDeleteFile }, // "Combat Simulator Player File"
{ 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_SEPARATOR, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
{ MENUITEMTYPE_SELECTABLE, 0, 0x00000004, L_OPTIONS(102), 0x00000000, (void *)&menudialog_controllerpakmenu }, // "Delete Game Notes..."
{ 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, menucustomChooseAgent },
{ MENUITEMTYPE_LIST, 0, 0x00200000, 0x000000f5, 0x00000000, fileListChooseAgentMenuHandler },
{ MENUITEMTYPE_END, 0, 0x00000000, 0x00000000, 0x00000000, NULL },
};
@ -58,7 +58,7 @@ struct menudialog menudialog_fileselect2 = {
MENUDIALOGTYPE_DEFAULT,
L_OPTIONS(95), // "Perfect Dark"
menuitems_fileselect2,
fileSelectMenuDialog,
filemanMainMenuDialog,
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)&pakMenuTextLocationName, 0x00000000, NULL },
{ MENUITEMTYPE_LABEL, 0, 0x00000230, (u32)&filemanMenuTextDeviceName, 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"

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 pakConsiderPushingFileSelectMenuDialog
/* f0badf0: 0fc43240 */ jal filemanConsiderPushingFileSelectDialog
/* f0badf4: 00000000 */ nop
/* f0badf8: 10000002 */ b .L0f0bae04
/* f0badfc: 00402025 */ or $a0,$v0,$zero

4
src/game/game_0f09f0.c
View File

@ -13870,8 +13870,8 @@ glabel var7f1b2b10
/* f0fd3e4: 00a62823 */ subu $a1,$a1,$a2
/* f0fd3e8: 01244823 */ subu $t1,$t1,$a0
/* f0fd3ec: 00094900 */ sll $t1,$t1,0x4
/* f0fd3f0: 3c068007 */ lui $a2,%hi(menudialog_controllerpakmenu)
/* f0fd3f4: 24c64c38 */ addiu $a2,$a2,%lo(menudialog_controllerpakmenu)
/* f0fd3f0: 3c068007 */ lui $a2,%hi(g_PakChoosePakMenuDialog)
/* f0fd3f4: 24c64c38 */ addiu $a2,$a2,%lo(g_PakChoosePakMenuDialog)
/* f0fd3f8: 01391821 */ addu $v1,$t1,$t9
/* f0fd3fc: 000528c0 */ sll $a1,$a1,0x3
.L0f0fd400:

618
src/game/game_107fb0.c
View File

File diff suppressed because it is too large Load Diff

2
src/game/game_179060.c
View File

@ -3286,7 +3286,7 @@ glabel var7f1b81a8
/* f17c11c: 10000018 */ b .L0f17c180
/* f17c120: 00001025 */ or $v0,$zero,$zero
.L0f17c124:
/* f17c124: 0fc42197 */ jal pakPushErrorDialog
/* f17c124: 0fc42197 */ jal filemanPushErrorDialog
/* f17c128: 24040005 */ addiu $a0,$zero,0x5
/* f17c12c: 10000014 */ b .L0f17c180
/* f17c130: 00001025 */ or $v0,$zero,$zero

4
src/game/gamefile.c
View File

@ -1469,8 +1469,8 @@ glabel func0f110bf8
void func0f110c5c(s32 locationindex, u8 filetype)
{
if (g_SaveLocations.locations[locationindex] == NULL) {
func0f15e5b8(align16(0x310), 1);
g_SaveLocations.locations[locationindex] = func00012ab0(align16(0x310));
func0f15e5b8(align16(sizeof(struct savelocation)), 1);
g_SaveLocations.locations[locationindex] = func00012ab0(align16(sizeof(struct savelocation)));
}
g_SaveLocations.locations[locationindex]->unk30c = 1;

20
src/include/constants.h
View File

@ -603,6 +603,16 @@
#define EYESPYMODE_DRUGSPY 1
#define EYESPYMODE_BOMBSPY 2
#define FILEERROR_NOPAK 0
#define FILEERROR_SAVEFAILED 1
#define FILEERROR_LOADFAILED 2
#define FILEERROR_DELETEFAILED 3
#define FILEERROR_OUTOFMEMORY 4
#define FILEERROR_ALREADYLOADED 5
#define FILEERROR_PAKREMOVED 6
#define FILEERROR_PAKDAMAGED 7
#define FILEERROR_DELETENOTEFAILED 8
#define FILETYPE_SOLO 0
#define FILETYPE_MPSETUP 1
#define FILETYPE_MPPLAYER 2
@ -2360,16 +2370,6 @@
#define PADFLAG_8000 0x8000
#define PADFLAG_10000 0x10000
#define PAKERROR_NOPAK 0
#define PAKERROR_SAVEFAILED 1
#define PAKERROR_LOADFAILED 2
#define PAKERROR_DELETEFAILED 3
#define PAKERROR_OUTOFMEMORY 4
#define PAKERROR_ALREADYLOADED 5
#define PAKERROR_PAKREMOVED 6
#define PAKERROR_PAKDAMAGED 7
#define PAKERROR_DELETENOTEFAILED 8
#define PATHFLAG_CIRCULAR 1
#define PATHFLAG_FLYING 2
#define PATHFLAG_04 4

36
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_PakErrorMenuDialog;
extern struct menudialog g_FilemanErrorMenuDialog;
extern u16 savelocations2[];
extern u16 iomessages2[];
extern u16 filetypenames[];
extern struct menudialog menudialog_filesaved;
extern struct menudialog menudialog_saveerror;
extern struct menudialog menudialog_savelost;
extern struct menudialog g_SaveElsewhereMenuDialog;
extern struct menudialog menudialog_1a654;
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 u32 var8007464c;
extern struct menudialog menudialog_changefilename;
extern struct menudialog menudialog_duplicatefilename;
extern struct menudialog g_FilemanChangeFileNameMenuDialog;
extern struct menudialog g_FilemanDuplicateFileNameMenuDialog;
extern u16 savelocations3[];
extern struct menudialog menudialog_selectlocation;
extern struct menudialog menudialog_confirmdelete;
extern struct menudialog menudialog_1a984;
extern struct menudialog menudialog_deletefile;
extern struct menudialog menudialog_copyfile;
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 pakdata *g_EditingPak;
extern struct menudialog menudialog_deletegamenote;
extern struct menudialog menudialog_gamenotes;
extern struct menudialog menudialog_controllerpakmenu;
extern struct menudialog menudialog_enteragentname;
extern struct menudialog menudialog_fileselect;
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 menudialog_fileselect2;
extern struct menudialog menudialog_mpquickgo2;
extern struct menudialog menudialog_1b1bc;

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

@ -3,27 +3,27 @@
#include <ultra64.h>
#include "types.h"
char *getSaveLocationName(s32 index);
char *pakMenuTextLocationName(struct menuitem *item);
char *filemanGetDeviceName(s32 index);
char *filemanMenuTextDeviceName(struct menuitem *item);
void func0f1080d0(char *buffer, struct savelocation000 *arg1, u32 arg2);
char *func0f1082b0(struct menuitem *item);
char *filemanMenuTextDeleteFileName(struct menuitem *item);
void func0f108324(s32 arg0);
void func0f1083b0(struct savelocation000 *arg0);
void func0f1083d0(struct savelocation000 *arg0, s32 arg1);
char *pakMenuTextFailReason(struct menuitem *item);
char *pakMenuTextDeviceNameForError(struct menuitem *item);
void pakPushErrorDialog(u16 errno);
void func0f1083d0(struct savelocation000 *arg0, s32 filetype);
char *filemanMenuTextFailReason(struct menuitem *item);
char *filemanMenuTextDeviceNameForError(struct menuitem *item);
void filemanPushErrorDialog(u16 errno);
char *func0f1086b8(s32 arg0, s32 arg1, s32 arg2);
char *func0f10876c(struct menuitem *item);
char *pakMenuTextFileType(struct menuitem *item);
char *filemanMenuTextErrorTitle(struct menuitem *item);
char *filemanMenuTextFileType(struct menuitem *item);
void func0f10898c(void);
void func0f108a80(void);
void func0f108d8c(void);
char *pakMenuTextPleaseInsertOriginalPak(struct menuitem *item);
void filemanEraseCorruptFile(void);
char *filemanMenuTextInsertOriginalPak(struct menuitem *item);
void func0f109038(s32 arg0);
bool func0f1091e0(s32 arg0, bool arg1);
bool func0f1094e4(struct savelocation_2d8 *arg0, s32 arg1, void *arg2);
void pakDeleteFile(void);
void filemanDeleteFile(void);
void func0f1097d0(s32 device);
void func0f109954(s32 arg0);
void func0f1099a8(char *buffer, struct savelocation000 *arg1);
@ -31,52 +31,52 @@ void func0f109a68(char *buffer);
void func0f109bb4(char *name);
bool func0f109c8c(s32 arg0);
void func0f109ec4(void);
char *pakMenuTextDeviceNameContainingDuplicateFile(struct menuitem *item);
char *pakMenuTextDuplicateFilename(struct menuitem *item);
char *pakMenuTextLocationName2(struct menuitem *item);
char *pakMenuTextSaveLocationSpaces(struct menuitem *item);
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 *pakMenuTextDeleteErrorDescription(struct menuitem *item);
char *filemanMenuTextFileInUseDescription(struct menuitem *item);
u32 func0f10a630(void);
bool func0f10a97c(struct savelocation000 *arg0);
s32 func0f10aad8(u32 operation, struct menuitem *item, union handlerdata *data, u32 arg3);
void func0f10b0c4(u32 arg0);
s32 filemanFileToCopyOrDeleteListMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data, bool isdelete);
void filemanPushDeleteFileDialog(u32 arg0);
char *pakMenuTextPagesFree(struct menuitem *item);
char *pakMenuTextPagesUsed(struct menuitem *item);
char *pakMenuTextStatusMessage(struct menuitem *item);
char *pakMenuTextEditingPakName(struct menuitem *item);
bool pakConsiderPushingFileSelectMenuDialog(void);
bool filemanConsiderPushingFileSelectDialog(void);
void pakPushPakMenuDialog(void);
s32 menucustomChooseAgent(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menucustomDeleteGameNote(u32 operation, struct menuitem *item, union handlerdata *data);
s32 pakListFileToCopyMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 pakListFileToDeleteMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menudialog00108e58(u32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menudialog0010b014(u32 operation, struct menudialog *dialog, union handlerdata *data);
s32 fileListChooseAgentMenuHandler(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 pakGameNotesMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data);
s32 pakControllerPakMenuMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data);
s32 fileSelectMenuDialog(u32 operation, struct menudialog *dialog, union handlerdata *data);
s32 menuhandler00108014(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandler00108254(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandler001084b8(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerPakErrorTryAgain(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerPakCancelSave2(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerAcknowledgePakFileLost(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandler00108ecc(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandler00108f08(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerPakRenameDuplicateSave(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerPakCancelDuplicateSave(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerPakCancelSave(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerDeleteFiles(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerPakConfirmDelete(u32 operation, struct menuitem *item, 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 pakDeleteGameNoteMenuHandler(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerPakSelection(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerAgentName(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerOpenCopyFile(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerOpenDeleteFile(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerRenameFile(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerSaveElsewhere(u32 operation, struct menuitem *item, union handlerdata *data);
s32 menuhandlerSaveLocation(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);
extern const char var7f1b3214[];
extern const char var7f1b3218[];

2
src/include/types.h
View File

@ -3864,7 +3864,7 @@ struct menudata_mpend {
};
struct menudata_filesel {
u32 slotindex;
u32 filetypeplusone;
u32 slotcount;
u32 unke24;
u32 unke28;