From a4288fe150eb4523828bd8468e80c3ebf415317f Mon Sep 17 00:00:00 2001 From: MysterD Date: Tue, 8 Sep 2020 09:52:48 -0700 Subject: [PATCH] Allow exiting from course at any time --- include/sm64.h | 2 +- src/game/ingame_menu.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/sm64.h b/include/sm64.h index 5b9deb8f..597734c8 100644 --- a/include/sm64.h +++ b/include/sm64.h @@ -402,7 +402,7 @@ #define ACT_GRABBED 0x00020370 // (0x170 | ACT_FLAG_STATIONARY | ACT_FLAG_INVULNERABLE) #define ACT_IN_CANNON 0x00001371 // (0x171 | ACT_FLAG_STATIONARY | ACT_FLAG_INTANGIBLE) #define ACT_TORNADO_TWIRLING 0x10020372 // (0x172 | ACT_FLAG_STATIONARY | ACT_FLAG_INVULNERABLE | ACT_FLAG_SWIMMING_OR_FLYING) -#define ACT_BUBBLED (0x173 | ACT_FLAG_MOVING) +#define ACT_BUBBLED (0x173 | ACT_FLAG_MOVING | ACT_FLAG_PAUSE_EXIT) // group 0x180: object actions #define ACT_PUNCHING 0x00800380 // (0x180 | ACT_FLAG_STATIONARY | ACT_FLAG_ATTACKING) diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c index 1e01c1f5..8fd5cf11 100644 --- a/src/game/ingame_menu.c +++ b/src/game/ingame_menu.c @@ -2718,8 +2718,8 @@ s16 render_pause_courses_and_castle(void) { render_pause_my_score_coins(); render_pause_red_coins(); -/* Added support for the "Exit course at any time" cheat */ - if ((gMarioStates[0].action & ACT_FLAG_PAUSE_EXIT) || (Cheats.EnableCheats && Cheats.ExitAnywhere)) { + /* Always allow exiting from course */ + if (TRUE || (gMarioStates[0].action & ACT_FLAG_PAUSE_EXIT) || (Cheats.EnableCheats && Cheats.ExitAnywhere)) { render_pause_course_options(99, 93, &gDialogLineNum, 15); }