Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve menu levels (#401) 

* Fix menu stuff

* Revert other change

* Whoops
This commit is contained in:
Emerald Lockdown 2023-07-04 16:12:21 -05:00 committed by GitHub
parent db77e38c0d
commit 6ee029e16f
1 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/game/level_update.c
View File

@ -54,9 +54,11 @@
#define WARP_NODE_CREDITS_START 0xF8
#define WARP_NODE_CREDITS_NEXT 0xF9
#define WARP_NODE_CREDITS_END 0xFA
#define WARP_NODE_CREDITS_MIN 0xF8
#define MENU_LEVEL_MIN 0
#define MENU_LEVEL_MAX 16
struct SavedWarpValues gReceiveWarp = { 0 };
extern s8 sReceivedLoadedActNum;
u8 gRejectInstantWarp = 0;
@ -1399,7 +1401,7 @@ s32 play_mode_change_level(void) {
/**
* Unused play mode. Doesn't call transition update and doesn't reset transition at the end.
*/
static s32 play_mode_unused(void) {
UNUSED static s32 play_mode_unused(void) {
if (--sTransitionTimer == -1) {
gHudDisplay.flags = HUD_DISPLAY_NONE;
@ -1443,15 +1445,9 @@ void update_menu_level(void) {
if (sIsDemoActive) {
stop_demo(NULL);
}
if (curLevel == LEVEL_JRB) {
gChangeLevel = curLevel;
gChangeActNum = 2;
} else if (curLevel == LEVEL_THI) {
gChangeLevel = LEVEL_THI;
} else {
gChangeLevel = curLevel;
gChangeActNum = 6;
}
gChangeLevel = curLevel;
gChangeActNum = 6;
gDemoCountdown = 0;
}
if (sIsDemoActive) {
@ -1599,16 +1595,8 @@ void update_menu_level(void) {
disable_background_sound();
if (get_current_background_music() == 0x0021) {
if (curLevel == LEVEL_JRB) {
gChangeLevel = curLevel;
gChangeActNum = 2;
} else if (curLevel == LEVEL_THI) {
gChangeLevel = curLevel;
gChangeActNum = 6;
} else {
gChangeLevel = curLevel;
gChangeActNum = 6;
}
gChangeLevel = curLevel;
gChangeActNum = 6;
}
}
}
@ -1735,9 +1723,8 @@ s32 init_level(void) {
if (gDjuiInMainMenu && (gNetworkType == NT_NONE)) {
// pick random main menu level
if (configMenuRandom) {
int lower = 0, upper = 10;
srand(time(0));
int randLevel = (rand() % (upper - lower + 1)) + lower;
int randLevel = rand() % (MENU_LEVEL_MAX - MENU_LEVEL_MIN) + 1;
configMenuLevel = randLevel;
}