From 76dae5e8dd2c2d3b59478a96ba8f1278c32a9be7 Mon Sep 17 00:00:00 2001 From: someone2639 Date: Thu, 14 Dec 2023 23:27:50 -0500 Subject: [PATCH] Add file select skip define (#723) * add config define to skip file select * implement file select skip * Add more coverage to the skip file select tweak --------- Co-authored-by: someone2639 --- include/config/config_cutscenes.h | 6 ++++++ levels/menu/script.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/include/config/config_cutscenes.h b/include/config/config_cutscenes.h index e1b0bdc5..ab2616b3 100644 --- a/include/config/config_cutscenes.h +++ b/include/config/config_cutscenes.h @@ -17,3 +17,9 @@ * Skips the title/splash screen (Super Mario 64 logo). */ // #define SKIP_TITLE_SCREEN + +/** + * Skips the File Select screen + */ +// #define SKIP_FILE_SELECT + diff --git a/levels/menu/script.c b/levels/menu/script.c index a4b032e2..72474a6c 100644 --- a/levels/menu/script.c +++ b/levels/menu/script.c @@ -6,6 +6,8 @@ #include "segment_symbols.h" #include "level_commands.h" +#include "config/config_cutscenes.h" + #include "game/area.h" #include "game/level_update.h" #include "menu/file_select.h" @@ -19,6 +21,7 @@ #include "levels/menu/header.h" const LevelScript level_main_menu_entry_file_select[] = { +#ifndef SKIP_FILE_SELECT INIT_LEVEL(), LOAD_GODDARD(), LOAD_LEVEL_DATA(menu), @@ -53,6 +56,7 @@ const LevelScript level_main_menu_entry_file_select[] = { SLEEP(/*frames*/ 16), CLEAR_LEVEL(), SLEEP_BEFORE_EXIT(/*frames*/ 1), +#endif // SKIP_FILE_SELECT SET_REG(/*value*/ START_LEVEL), EXIT_AND_EXECUTE(/*seg*/ SEGMENT_GLOBAL_LEVEL_SCRIPT, _scriptsSegmentRomStart, _scriptsSegmentRomEnd, level_main_scripts_entry), };