added option to exit course while moving

This commit is contained in:
Reonu
2021-07-03 20:42:31 +01:00
parent 39de47a435
commit 91b8a9b1d8
3 changed files with 9 additions and 2 deletions

View File

@@ -16,6 +16,7 @@ This is a fork of the ultrasm64 repo by CrashOveride which includes the followin
- Mario head skip * - Mario head skip *
- Peach letter cutscene skip * - Peach letter cutscene skip *
- Ability to easily change the warp that EXIT COURSE takes you to via config.h, or disable it entirely - Ability to easily change the warp that EXIT COURSE takes you to via config.h, or disable it entirely
- Exit course while moving *
- Toggle to disable fall damage and the fall damage sound * - Toggle to disable fall damage and the fall damage sound *
- Ability to configure whether there's a 100 coin star at all and how many coins are required to spawn it * - Ability to configure whether there's a 100 coin star at all and how many coins are required to spawn it *
- Non-stop stars * - Non-stop stars *

View File

@@ -88,6 +88,8 @@
#define TREE_PARTICLE_FIX #define TREE_PARTICLE_FIX
// Disable exit course // Disable exit course
//#define DISABLE_EXIT_COURSE //#define DISABLE_EXIT_COURSE
// Decides whether you can exit course while moving (has no effect if you disable exit course)
//#define EXIT_COURSE_WHILE_MOVING
// Decides which level "exit course" takes you to (has no effect if you disable exit course) // Decides which level "exit course" takes you to (has no effect if you disable exit course)
#define EXIT_COURSE_LEVEL LEVEL_CASTLE #define EXIT_COURSE_LEVEL LEVEL_CASTLE
// Decides the area node "exit course" takes you to (has no effect if you disable exit course) // Decides the area node "exit course" takes you to (has no effect if you disable exit course)

View File

@@ -1751,8 +1751,12 @@ s16 render_pause_courses_and_castle(void) {
} }
} }
#endif #endif
#ifndef EXIT_COURSE_WHILE_MOVING
if (gMarioStates[0].action & ACT_FLAG_PAUSE_EXIT) { s32 exitCheck = gMarioStates[0].action & ACT_FLAG_PAUSE_EXIT;
#else
s32 exitCheck = 1;
#endif
if (exitCheck) {
#ifndef DISABLE_EXIT_COURSE #ifndef DISABLE_EXIT_COURSE
render_pause_course_options(99, 93, &gDialogLineNum, 15); render_pause_course_options(99, 93, &gDialogLineNum, 15);
#endif #endif