etc/sm64coopdx
0
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2024-11-25 21:45:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix main menu intro cutscene pipe

Browse source
This commit is contained in:
Agent X 2023-10-30 19:16:16 -04:00
parent 7131a80167
commit 6d1f1cb776
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/game/level_update.c
View file

@ -1492,17 +1492,11 @@ void update_menu_level(void) {
sWarpDest.areaIdx = 2; sWarpDest.areaIdx = 2;
sWarpDest.nodeId = 0x0A; sWarpDest.nodeId = 0x0A;
} }
// set sFirstCastleGroundsMenu to false to prevent wall hugging bug
if (curLevel != LEVEL_CASTLE_GROUNDS) {
sFirstCastleGroundsMenu = false;
}
struct Object *o; struct Object *o;
// set mario/camera pos // set mario/camera pos
switch (gCurrLevelNum) { switch (gCurrLevelNum) {
case LEVEL_CASTLE_GROUNDS: case LEVEL_CASTLE_GROUNDS:
if (!sFirstCastleGroundsMenu) { if (gMarioState->action != ACT_INTRO_CUTSCENE && gMarioState->prevAction != ACT_INTRO_CUTSCENE) {
vec3f_set(gMarioState->pos, -1328, 260, 4664); vec3f_set(gMarioState->pos, -1328, 260, 4664);
vec3f_set(gLakituState.curPos, -1328, 390, 6064); vec3f_set(gLakituState.curPos, -1328, 390, 6064);
gMarioState->faceAngle[1] = 0; gMarioState->faceAngle[1] = 0;
@ -1765,6 +1759,7 @@ s32 init_level(void) {
if (configMenuLevel == 0 && sFirstCastleGroundsMenu) { if (configMenuLevel == 0 && sFirstCastleGroundsMenu) {
set_mario_action(gMarioState, ACT_INTRO_CUTSCENE, 7); set_mario_action(gMarioState, ACT_INTRO_CUTSCENE, 7);
sFirstCastleGroundsMenu = false;
} else { } else {
set_mario_action(gMarioState, ACT_IDLE, 0); set_mario_action(gMarioState, ACT_IDLE, 0);
} }