Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'coop' of github.com:sm64ex-coop-dev/sm64ex-coop into coop

This commit is contained in:
MysterD 2022-08-25 20:42:43 -07:00
parent bc8e9ff19b 0bb66abe61
commit 9963db2771
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/game/level_update.c
View File

@ -1340,11 +1340,15 @@ void update_menu_level(void) {
// warp to level, this feels buggy
if (gCurrLevelNum != curLevel) {
if (curLevel == LEVEL_JRB) {
dynos_warp_to_level(curLevel, 1, 2);
gChangeLevel = curLevel;
gChangeActNum = 2;
} else if (curLevel == LEVEL_THI) {
dynos_warp_to_level(curLevel, 2, 6);
gChangeLevel = curLevel;
gChangeAreaIndex = 2;
gChangeActNum = 6;
} else {
dynos_warp_to_level(curLevel, 1, 6);
gChangeLevel = curLevel;
gChangeActNum = 6;
}
}
@ -1452,11 +1456,15 @@ void update_menu_level(void) {
if (get_current_background_music() == 0x0021) {
if (curLevel == LEVEL_JRB) {
dynos_warp_to_level(curLevel, 1, 2);
gChangeLevel = curLevel;
gChangeActNum = 2;
} else if (curLevel == LEVEL_THI) {
dynos_warp_to_level(curLevel, 2, 6);
gChangeLevel = curLevel;
gChangeAreaIndex = 2;
gChangeActNum = 6;
} else {
dynos_warp_to_level(curLevel, 1, 6);
gChangeLevel = curLevel;
gChangeActNum = 6;
}
}
}
@ -1720,6 +1728,10 @@ s32 lvl_set_current_level(UNUSED s16 arg0, s32 levelNum) {
disable_warp_checkpoint();
}
if (gDjuiInMainMenu) {
return 0;
}
if (foundHook) {
return hookUseActSelect;
}