From f58ddd095e80b17ce6f0eeb6d1483a52b4a30024 Mon Sep 17 00:00:00 2001 From: Martin Pham Date: Sun, 2 Aug 2020 18:07:37 +0200 Subject: [PATCH 1/4] Update cheats.h Forever shell menu --- src/pc/cheats.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pc/cheats.h b/src/pc/cheats.h index eaf71ab4..52323395 100644 --- a/src/pc/cheats.h +++ b/src/pc/cheats.h @@ -13,6 +13,7 @@ struct CheatList { bool ExitAnywhere; bool HugeMario; bool TinyMario; + bool ForeverShell; }; extern struct CheatList Cheats; From e160c196eed0c8cec21aa2025abbe6154a2baab7 Mon Sep 17 00:00:00 2001 From: Martin Pham Date: Sun, 2 Aug 2020 18:08:58 +0200 Subject: [PATCH 2/4] Update text_options_strings.h.in cheat menu --- include/text_options_strings.h.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/text_options_strings.h.in b/include/text_options_strings.h.in index a1ce481f..13a1869f 100644 --- a/include/text_options_strings.h.in +++ b/include/text_options_strings.h.in @@ -84,6 +84,7 @@ #define TEXT_OPT_CHEAT7 _("EXIT COURSE AT ANY TIME") #define TEXT_OPT_CHEAT8 _("HUGE MARIO") #define TEXT_OPT_CHEAT9 _("TINY MARIO") +#define TEXT_OPT_FOREVER_SHELL _("FOREVER SHELL") #else // VERSION @@ -148,6 +149,7 @@ #define TEXT_OPT_CHEAT7 _("Exit course at any time") #define TEXT_OPT_CHEAT8 _("Huge Mario") #define TEXT_OPT_CHEAT9 _("Tiny Mario") +#define TEXT_OPT_FOREVER_SHELL _("Forever Shell") #endif // VERSION From 6e5464a9a0ec04b7dcd79783bdb6bedd313e9ebe Mon Sep 17 00:00:00 2001 From: Martin Pham Date: Sun, 2 Aug 2020 18:10:21 +0200 Subject: [PATCH 3/4] Update options_menu.c cheat menu item --- src/game/options_menu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/game/options_menu.c b/src/game/options_menu.c index 56dba619..2745fd5c 100644 --- a/src/game/options_menu.c +++ b/src/game/options_menu.c @@ -279,6 +279,7 @@ static struct Option optsCheats[] = { DEF_OPT_TOGGLE( optsCheatsStr[6], &Cheats.ExitAnywhere ), DEF_OPT_TOGGLE( optsCheatsStr[7], &Cheats.HugeMario ), DEF_OPT_TOGGLE( optsCheatsStr[8], &Cheats.TinyMario ), + DEF_OPT_TOGGLE( optsCheatsStr[9], &Cheats.ForeverShell ), }; From f66c00c5550957dc4a13b9cc47a427a1b55c6cdf Mon Sep 17 00:00:00 2001 From: Martin Pham Date: Sun, 2 Aug 2020 18:11:50 +0200 Subject: [PATCH 4/4] Update mario_actions_moving.c --- src/game/mario_actions_moving.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/mario_actions_moving.c b/src/game/mario_actions_moving.c index 0ccbccf1..865366be 100644 --- a/src/game/mario_actions_moving.c +++ b/src/game/mario_actions_moving.c @@ -1235,11 +1235,11 @@ s32 act_riding_shell_ground(struct MarioState *m) { break; case GROUND_STEP_HIT_WALL: - mario_stop_riding_object(m); + if (!Cheats.EnableCheats || !Cheats.ForeverShell) { mario_stop_riding_object(m); } play_sound(m->flags & MARIO_METAL_CAP ? SOUND_ACTION_METAL_BONK : SOUND_ACTION_BONK, m->marioObj->header.gfx.cameraToObject); m->particleFlags |= PARTICLE_VERTICAL_STAR; - set_mario_action(m, ACT_BACKWARD_GROUND_KB, 0); + if (!Cheats.EnableCheats || !Cheats.ForeverShell) { set_mario_action(m, ACT_BACKWARD_GROUND_KB, 0); } break; }