From 039eb8b562b86aa5848b142cbaa8f4534776000c Mon Sep 17 00:00:00 2001 From: Catherine Reprobate Date: Fri, 25 Oct 2024 19:47:44 -0700 Subject: [PATCH] rename `struct menudata.unk00c-> prevmenudata` --- src/game/menu.c | 4 ++-- src/game/menutick.c | 10 +++++----- src/include/types.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/game/menu.c b/src/game/menu.c index cb10ffdec..705beed9a 100644 --- a/src/game/menu.c +++ b/src/game/menu.c @@ -3609,7 +3609,7 @@ void func0f0f820c(struct menudialogdef *dialogdef, s32 root) g_MpPlayerNum = prevplayernum; g_MenuData.prevmenuroot = root; - g_MenuData.unk00c = dialogdef; + g_MenuData.prevmenudialog = dialogdef; } void menuSetBackground(s32 bg) @@ -4005,7 +4005,7 @@ void menuReset(void) } g_MenuData.unk668 = -1; - g_MenuData.unk00c = 0; + g_MenuData.prevmenudialog = 0; g_MenuData.prevmenuroot = -1; g_MenuData.count = 0; g_MenuData.root = 0; diff --git a/src/game/menutick.c b/src/game/menutick.c index 1684caa06..ca7606067 100644 --- a/src/game/menutick.c +++ b/src/game/menutick.c @@ -498,13 +498,13 @@ void menuTick(void) && g_MenuData.prevmenuroot == -1) { if (g_Vars.mpsetupmenu == MPSETUPMENU_GENERAL) { g_MenuData.prevmenuroot = MENUROOT_MAINMENU; - g_MenuData.unk00c = IS4MB() ? &g_CiMenuViaPauseMenuDialog : &g_CiMenuViaPcMenuDialog; + g_MenuData.prevmenudialog = IS4MB() ? &g_CiMenuViaPauseMenuDialog : &g_CiMenuViaPcMenuDialog; } else if (IS4MB()) { g_MenuData.prevmenuroot = MENUROOT_4MBMAINMENU; - g_MenuData.unk00c = &g_MainMenu4MbMenuDialog; + g_MenuData.prevmenudialog = &g_MainMenu4MbMenuDialog; } else { g_MenuData.prevmenuroot = MENUROOT_MPSETUP; - g_MenuData.unk00c = &g_CombatSimulatorMenuDialog; + g_MenuData.prevmenudialog = &g_CombatSimulatorMenuDialog; } } @@ -570,7 +570,7 @@ void menuTick(void) musicQueueStopAllEvent(); } else { bool startmusic = false; - menuPushRootDialog(g_MenuData.unk00c, g_MenuData.prevmenuroot); + menuPushRootDialog(g_MenuData.prevmenudialog, g_MenuData.prevmenuroot); sp344 = true; if (g_MenuData.root == MENUROOT_MPSETUP || g_MenuData.root == MENUROOT_4MBMAINMENU) { @@ -597,7 +597,7 @@ void menuTick(void) } } - g_MenuData.unk00c = NULL; + g_MenuData.prevmenudialog = NULL; g_MenuData.prevmenuroot = -1; } else { switch (g_MenuData.root) { diff --git a/src/include/types.h b/src/include/types.h index a2bcd9d6e..ca5e2b916 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -4786,7 +4786,7 @@ struct menudata { /*0x000*/ s32 count; /*0x004*/ s32 root; /*0x008*/ s32 prevmenuroot; // also a menuroot constant - /*0x00c*/ struct menudialogdef *unk00c; + /*0x00c*/ struct menudialogdef *prevmenudialog; /*0x010*/ f32 unk010; /*0x014*/ u8 bg; /*0x015*/ u8 nextbg;