sm64-mirrors/sm64ex-alo
1
0
Fork 0
mirror of https://github.com/AloUltraExt/sm64ex-alo.git synced 2025-01-23 08:02:14 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make debug level select work without GODDARD_MFACE

Browse source
This commit is contained in:
AloXado320 2021-09-09 02:22:46 -05:00
parent 3e3d489c8b
commit 8a4545df95
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
levels/intro/script.c
View file

@ -116,10 +116,18 @@ const LevelScript level_intro_mario_head_dizzy[] = {
};
#else
const LevelScript level_intro_mario_head_regular[] = {
INIT_LEVEL(),
CALL_LOOP(/*arg*/ LVL_INTRO_REGULAR, /*func*/ lvl_intro_update),
JUMP_IF(/*op*/ OP_EQ, /*arg*/ 100, script_intro_L1),
JUMP_IF(/*op*/ OP_EQ, /*arg*/ 101, script_intro_L2),
EXIT_AND_EXECUTE(/*seg*/ 0x14, _menuSegmentRomStart, _menuSegmentRomEnd, level_main_menu_entry_1),
};
const LevelScript level_intro_mario_head_dizzy[] = {
INIT_LEVEL(),
CALL_LOOP(/*arg*/ LVL_INTRO_GAME_OVER, /*func*/ lvl_intro_update),
JUMP_IF(/*op*/ OP_EQ, /*arg*/ 100, script_intro_L1),
JUMP_IF(/*op*/ OP_EQ, /*arg*/ 101, script_intro_L2),
EXIT_AND_EXECUTE(/*seg*/ 0x14, _introSegmentRomStart, _introSegmentRomEnd, level_intro_splash_screen),
};
#endif

11
src/menu/title_screen.c
View file

@ -33,7 +33,7 @@ static char sLevelSelectStageNames[64][16] = {
#undef DEFINE_LEVEL
static u16 sDemoCountdown = 0;
#ifndef VERSION_JP
#if !defined(VERSION_JP) && defined(GODDARD_MFACE)
static s16 sPlayMarioGreeting = TRUE;
static s16 sPlayMarioGameOver = TRUE;
#endif
@ -146,6 +146,7 @@ s16 intro_level_select(void) {
return 0;
}
#ifdef GODDARD_MFACE
/**
* Regular intro function that handles Mario's greeting voice and game start.
*/
@ -220,6 +221,7 @@ s32 intro_game_over(void) {
}
return run_level_id_or_demo(level);
}
#endif
/**
* Plays the casual "It's a me mario" when the game stars.
@ -241,12 +243,19 @@ s32 lvl_intro_update(s16 arg, UNUSED s32 unusedArg) {
case LVL_INTRO_PLAY_ITS_A_ME_MARIO:
retVar = intro_play_its_a_me_mario();
break;
#ifdef GODDARD_MFACE
case LVL_INTRO_REGULAR:
retVar = intro_regular();
break;
case LVL_INTRO_GAME_OVER:
retVar = intro_game_over();
break;
#else
case LVL_INTRO_REGULAR:
case LVL_INTRO_GAME_OVER:
retVar = (100 + gDebugLevelSelect);
break;
#endif
case LVL_INTRO_LEVEL_SELECT:
retVar = intro_level_select();
break;