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

Allow exiting from course at any time

This commit is contained in:
MysterD 2020-09-08 09:52:48 -07:00
parent c12380aff4
commit a4288fe150
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sm64.h
View File

@ -402,7 +402,7 @@
#define ACT_GRABBED 0x00020370 // (0x170 | ACT_FLAG_STATIONARY | ACT_FLAG_INVULNERABLE) #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_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_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 // group 0x180: object actions
#define ACT_PUNCHING 0x00800380 // (0x180 | ACT_FLAG_STATIONARY | ACT_FLAG_ATTACKING) #define ACT_PUNCHING 0x00800380 // (0x180 | ACT_FLAG_STATIONARY | ACT_FLAG_ATTACKING)

4
src/game/ingame_menu.c
View File

@ -2718,8 +2718,8 @@ s16 render_pause_courses_and_castle(void) {
render_pause_my_score_coins(); render_pause_my_score_coins();
render_pause_red_coins(); render_pause_red_coins();
/* Added support for the "Exit course at any time" cheat */ /* Always allow exiting from course */
if ((gMarioStates[0].action & ACT_FLAG_PAUSE_EXIT) || (Cheats.EnableCheats && Cheats.ExitAnywhere)) { if (TRUE || (gMarioStates[0].action & ACT_FLAG_PAUSE_EXIT) || (Cheats.EnableCheats && Cheats.ExitAnywhere)) {
render_pause_course_options(99, 93, &gDialogLineNum, 15); render_pause_course_options(99, 93, &gDialogLineNum, 15);
} }