Skip to content

Commit 039eb8b

Browse files
committed
rename struct menudata.unk00c-> prevmenudata
1 parent 872aa3a commit 039eb8b

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

src/game/menu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3609,7 +3609,7 @@ void func0f0f820c(struct menudialogdef *dialogdef, s32 root)
36093609
g_MpPlayerNum = prevplayernum;
36103610

36113611
g_MenuData.prevmenuroot = root;
3612-
g_MenuData.unk00c = dialogdef;
3612+
g_MenuData.prevmenudialog = dialogdef;
36133613
}
36143614

36153615
void menuSetBackground(s32 bg)
@@ -4005,7 +4005,7 @@ void menuReset(void)
40054005
}
40064006

40074007
g_MenuData.unk668 = -1;
4008-
g_MenuData.unk00c = 0;
4008+
g_MenuData.prevmenudialog = 0;
40094009
g_MenuData.prevmenuroot = -1;
40104010
g_MenuData.count = 0;
40114011
g_MenuData.root = 0;

src/game/menutick.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -498,13 +498,13 @@ void menuTick(void)
498498
&& g_MenuData.prevmenuroot == -1) {
499499
if (g_Vars.mpsetupmenu == MPSETUPMENU_GENERAL) {
500500
g_MenuData.prevmenuroot = MENUROOT_MAINMENU;
501-
g_MenuData.unk00c = IS4MB() ? &g_CiMenuViaPauseMenuDialog : &g_CiMenuViaPcMenuDialog;
501+
g_MenuData.prevmenudialog = IS4MB() ? &g_CiMenuViaPauseMenuDialog : &g_CiMenuViaPcMenuDialog;
502502
} else if (IS4MB()) {
503503
g_MenuData.prevmenuroot = MENUROOT_4MBMAINMENU;
504-
g_MenuData.unk00c = &g_MainMenu4MbMenuDialog;
504+
g_MenuData.prevmenudialog = &g_MainMenu4MbMenuDialog;
505505
} else {
506506
g_MenuData.prevmenuroot = MENUROOT_MPSETUP;
507-
g_MenuData.unk00c = &g_CombatSimulatorMenuDialog;
507+
g_MenuData.prevmenudialog = &g_CombatSimulatorMenuDialog;
508508
}
509509
}
510510

@@ -570,7 +570,7 @@ void menuTick(void)
570570
musicQueueStopAllEvent();
571571
} else {
572572
bool startmusic = false;
573-
menuPushRootDialog(g_MenuData.unk00c, g_MenuData.prevmenuroot);
573+
menuPushRootDialog(g_MenuData.prevmenudialog, g_MenuData.prevmenuroot);
574574
sp344 = true;
575575

576576
if (g_MenuData.root == MENUROOT_MPSETUP || g_MenuData.root == MENUROOT_4MBMAINMENU) {
@@ -597,7 +597,7 @@ void menuTick(void)
597597
}
598598
}
599599

600-
g_MenuData.unk00c = NULL;
600+
g_MenuData.prevmenudialog = NULL;
601601
g_MenuData.prevmenuroot = -1;
602602
} else {
603603
switch (g_MenuData.root) {

src/include/types.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4786,7 +4786,7 @@ struct menudata {
47864786
/*0x000*/ s32 count;
47874787
/*0x004*/ s32 root;
47884788
/*0x008*/ s32 prevmenuroot; // also a menuroot constant
4789-
/*0x00c*/ struct menudialogdef *unk00c;
4789+
/*0x00c*/ struct menudialogdef *prevmenudialog;
47904790
/*0x010*/ f32 unk010;
47914791
/*0x014*/ u8 bg;
47924792
/*0x015*/ u8 nextbg;

0 commit comments

Comments
 (0)