diff --git a/src/game/endscreen.c b/src/game/endscreen.c index 8f48695bf..2f9eb72f2 100644 --- a/src/game/endscreen.c +++ b/src/game/endscreen.c @@ -525,7 +525,7 @@ void endscreenHandleContinue(s32 context) } } else { if (context == 1) { - menuPushRootDialog(&g_MenuDialogContinueOrReplay, MENUROOT_9); + menuPushRootDialog(&g_MenuDialogContinueOrReplay, MENUROOT_COOPCONTINUE); } else { menuPushDialog(&g_MenuDialogContinueOrReplay); } @@ -555,7 +555,7 @@ void endscreenHandleContinue(s32 context) func0f10d770(); if (context == 1) { - menuPushRootDialog(func0f10d730(), MENUROOT_9); + menuPushRootDialog(func0f10d730(), MENUROOT_COOPCONTINUE); } else { menuPushDialog(func0f10d730()); } @@ -1600,7 +1600,7 @@ void soloPushSoloModeEndscreen(void) || !objectiveIsAllComplete()) { // Failed or aborted func0f10d770(); - menuPushRootDialog(&g_MenuDialogRetryMission, MENUROOT_9); + menuPushRootDialog(&g_MenuDialogRetryMission, MENUROOT_COOPCONTINUE); } else { // Completed endscreenHandleContinue(1); diff --git a/src/game/game_01bea0.c b/src/game/game_01bea0.c index e23f47d30..0516523f2 100644 --- a/src/game/game_01bea0.c +++ b/src/game/game_01bea0.c @@ -2483,7 +2483,7 @@ glabel var7f1a863c // } // } // break; -// case MENUROOT_9: // d348 +// case MENUROOT_COOPCONTINUE: // d348 // if (g_Vars.coopplayernum >= 0) { // mpSetPaused(MPPAUSEMODE_UNPAUSED); // g_Vars.mplayerisrunning = false; @@ -2564,7 +2564,7 @@ glabel var7f1a863c // case MENUROOT_MPENDSCREEN: // case MENUROOT_FILEMGR: // case MENUROOT_BOOTPAKMGR: -// case MENUROOT_10: +// case MENUROOT_4MBFILEMGR: // case MENUROOT_4MBMAINMENU: // case MENUROOT_TRAINING: // f01d5b4 // if (g_Menus[mpindex].curframe) { diff --git a/src/game/game_0b63b0.c b/src/game/game_0b63b0.c index 43191a8bc..4f28e9bf9 100644 --- a/src/game/game_0b63b0.c +++ b/src/game/game_0b63b0.c @@ -4965,7 +4965,7 @@ bool func0f0bc4c0(void) return true; } - return (var80070764 && !var8005d9d0) || menuGetRoot() == MENUROOT_9; + return (var80070764 && !var8005d9d0) || menuGetRoot() == MENUROOT_COOPCONTINUE; } s16 currentPlayerGetViewportWidth(void) diff --git a/src/game/game_10c9c0.c b/src/game/game_10c9c0.c index 38cbe827c..9df32ca22 100644 --- a/src/game/game_10c9c0.c +++ b/src/game/game_10c9c0.c @@ -84,7 +84,7 @@ void func0f10cb2c(void) mpDetermineUnlockedFeatures(); - menuPushRootDialog(&menudialog_fileselect2, MENUROOT_10); + menuPushRootDialog(&menudialog_fileselect2, MENUROOT_4MBFILEMGR); } g_MpPlayerNum = prevplayernum; diff --git a/src/include/constants.h b/src/include/constants.h index b8accff1a..1bea96873 100644 --- a/src/include/constants.h +++ b/src/include/constants.h @@ -1197,18 +1197,18 @@ #define MENUOP_CLOSE 101 #define MENUOP_TICK 102 -#define MENUROOT_ENDSCREEN 1 -#define MENUROOT_MAINMENU 2 -#define MENUROOT_MPSETUP 3 -#define MENUROOT_MPPAUSE 4 -#define MENUROOT_MPENDSCREEN 5 -#define MENUROOT_FILEMGR 6 -#define MENUROOT_BOOTPAKMGR 7 -#define MENUROOT_PICKTARGET 8 -#define MENUROOT_9 9 -#define MENUROOT_10 10 -#define MENUROOT_4MBMAINMENU 11 -#define MENUROOT_TRAINING 13 +#define MENUROOT_ENDSCREEN 1 +#define MENUROOT_MAINMENU 2 +#define MENUROOT_MPSETUP 3 +#define MENUROOT_MPPAUSE 4 +#define MENUROOT_MPENDSCREEN 5 +#define MENUROOT_FILEMGR 6 +#define MENUROOT_BOOTPAKMGR 7 +#define MENUROOT_PICKTARGET 8 +#define MENUROOT_COOPCONTINUE 9 +#define MENUROOT_4MBFILEMGR 10 +#define MENUROOT_4MBMAINMENU 11 +#define MENUROOT_TRAINING 13 #define MENUSOUND_SWIPE 0x00 // Navigating to left/right dialog #define MENUSOUND_OPENDIALOG 0x01