Ports/perfect_dark
1
0 Fork 1
mirror of https://github.com/perfect-dark-pc-port/perfect_dark.git synced 2026-10-23 15:52:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #605 from cylonicboom/pr/rename-unk008

Browse Source 
rename `struct menudata.unk008|unk00c` properties
This commit is contained in:
fgsfds authored and GitHub committed 2025-04-28 09:23:05 +02:00
2 parents 4b8e1d52b5 039eb8b562
commit 816d83a0b5
3 files changed
+24 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/menu.c
+5 -5
View File
@@ -3608,8 +3608,8 @@ void func0f0f820c(struct menudialogdef *dialogdef, s32 root)
g_MpPlayerNum = prevplayernum;
g_MenuData.unk008 = root;
g_MenuData.unk00c = dialogdef;
g_MenuData.prevmenuroot = root;
g_MenuData.prevmenudialog = dialogdef;
}
void menuSetBackground(s32 bg)
@@ -3683,7 +3683,7 @@ void menuPushRootDialog(struct menudialogdef *dialogdef, s32 root)
g_Menus[g_MpPlayerNum].unk820 = 1;
g_MenuData.root = root;
g_MenuData.unk008 = -1;
g_MenuData.prevmenuroot = -1;
g_MenuData.unk5d5_02 = false;
if (root == MENUROOT_MAINMENU
@@ -4005,8 +4005,8 @@ void menuReset(void)
}
g_MenuData.unk668 = -1;
g_MenuData.unk00c = 0;
g_MenuData.unk008 = -1;
g_MenuData.prevmenudialog = 0;
g_MenuData.prevmenuroot = -1;
g_MenuData.count = 0;
g_MenuData.root = 0;
g_MenuData.unk010 = 0;
src/game/menutick.c
+17 -17
View File
@@ -285,7 +285,7 @@ void menuTick(void)
var8006294c = 1;
if (g_MenuData.root == MENUROOT_MPSETUP || g_MenuData.root == MENUROOT_4MBMAINMENU) {
if (g_MenuData.unk008 == -1) {
if (g_MenuData.prevmenuroot == -1) {
g_MpSetup.chrslots &= 0xfff0;
}
@@ -295,7 +295,7 @@ void menuTick(void)
if (g_Menus[i].curdialog) {
g_Menus[i].playernum = g_MpNumJoined++;
if (g_MenuData.unk008 == -1) {
if (g_MenuData.prevmenuroot == -1) {
g_MpSetup.chrslots |= (1 << i);
}
}
@@ -493,23 +493,23 @@ void menuTick(void)
}
}
if ((g_MenuData.unk5d5_06 || g_MenuData.unk008 != -1) && sp344 == false) {
if ((g_MenuData.unk5d5_06 || g_MenuData.prevmenuroot != -1) && sp344 == false) {
if ((g_MenuData.root == MENUROOT_MPSETUP || g_MenuData.root == MENUROOT_4MBMAINMENU)
&& g_MenuData.unk008 == -1) {
&& g_MenuData.prevmenuroot == -1) {
if (g_Vars.mpsetupmenu == MPSETUPMENU_GENERAL) {
g_MenuData.unk008 = MENUROOT_MAINMENU;
g_MenuData.unk00c = IS4MB() ? &g_CiMenuViaPauseMenuDialog : &g_CiMenuViaPcMenuDialog;
g_MenuData.prevmenuroot = MENUROOT_MAINMENU;
g_MenuData.prevmenudialog = IS4MB() ? &g_CiMenuViaPauseMenuDialog : &g_CiMenuViaPcMenuDialog;
} else if (IS4MB()) {
g_MenuData.unk008 = MENUROOT_4MBMAINMENU;
g_MenuData.unk00c = &g_MainMenu4MbMenuDialog;
g_MenuData.prevmenuroot = MENUROOT_4MBMAINMENU;
g_MenuData.prevmenudialog = &g_MainMenu4MbMenuDialog;
} else {
g_MenuData.unk008 = MENUROOT_MPSETUP;
g_MenuData.unk00c = &g_CombatSimulatorMenuDialog;
g_MenuData.prevmenuroot = MENUROOT_MPSETUP;
g_MenuData.prevmenudialog = &g_CombatSimulatorMenuDialog;
}
}
if (g_MenuData.unk008 != -1) {
if (g_MenuData.unk008 == -5) {
if (g_MenuData.prevmenuroot != -1) {
if (g_MenuData.prevmenuroot == -5) {
// Match is beginning
mpStartMatch();
menuStop();
@@ -518,7 +518,7 @@ void menuTick(void)
bossfileSave();
g_Vars.modifiedfiles &= ~MODFILE_MPSETUP;
}
} else if (g_MenuData.unk008 == -6) {
} else if (g_MenuData.prevmenuroot == -6) {
// Match is ending
s32 playernum = 0;
@@ -561,7 +561,7 @@ void menuTick(void)
playernum++;
}
}
} else if (g_MenuData.unk008 == -7) {
} else if (g_MenuData.prevmenuroot == -7) {
menuStop();
g_FileState = FILESTATE_CHANGINGAGENT;
gamefileLoadDefaults(&g_GameFile);
@@ -570,7 +570,7 @@ void menuTick(void)
musicQueueStopAllEvent();
} else {
bool startmusic = false;
menuPushRootDialog(g_MenuData.unk00c, g_MenuData.unk008);
menuPushRootDialog(g_MenuData.prevmenudialog, g_MenuData.prevmenuroot);
sp344 = true;
if (g_MenuData.root == MENUROOT_MPSETUP || g_MenuData.root == MENUROOT_4MBMAINMENU) {
@@ -597,8 +597,8 @@ void menuTick(void)
}
}
g_MenuData.unk00c = NULL;
g_MenuData.unk008 = -1;
g_MenuData.prevmenudialog = NULL;
g_MenuData.prevmenuroot = -1;
} else {
switch (g_MenuData.root) {
case MENUROOT_ENDSCREEN:
src/include/types.h
+2 -2
View File
@@ -4785,8 +4785,8 @@ struct menudata_5d8 {
struct menudata {
/*0x000*/ s32 count;
/*0x004*/ s32 root;
/*0x008*/ s32 unk008; // also a menuroot constant
/*0x00c*/ struct menudialogdef *unk00c;
/*0x008*/ s32 prevmenuroot; // also a menuroot constant
/*0x00c*/ struct menudialogdef *prevmenudialog;
/*0x010*/ f32 unk010;
/*0x014*/ u8 bg;
/*0x015*/ u8 nextbg;