diff --git a/include/config/config_debug.h b/include/config/config_debug.h index 3ca837757..b8edd5929 100644 --- a/include/config/config_debug.h +++ b/include/config/config_debug.h @@ -15,11 +15,6 @@ */ // #define DETERMINISTIC_BUILD -/** - * Skips the N64 logo and boots directly into the game if defined (may already be skipped by the options below) - */ -// #define SKIP_N64_BOOT_LOGO - /** * Options for booting directly into a scene, the map select or the file select, instead of the title screen. */ diff --git a/include/config/config_game.h b/include/config/config_game.h index 2d6a57756..d5a889c15 100644 --- a/include/config/config_game.h +++ b/include/config/config_game.h @@ -84,4 +84,14 @@ // Use the button colors of the N64 version instead of GameCube #define N64_BTN_COLORS +/** + * Skips the N64 logo and boots directly into the game if defined (may already be skipped by the options below) + */ +// #define SKIP_N64_BOOT_LOGO + +/** + * Use Majora's Masks' N64 Logo logic +*/ +// #define MM_N64_BOOT_LOGO + #endif diff --git a/src/overlays/gamestates/ovl_title/z_title.c b/src/overlays/gamestates/ovl_title/z_title.c index ce679dc2c..722c8b83c 100644 --- a/src/overlays/gamestates/ovl_title/z_title.c +++ b/src/overlays/gamestates/ovl_title/z_title.c @@ -55,7 +55,11 @@ void ConsoleLogo_Update(ConsoleLogoState* this) { this->coverAlpha += this->addAlpha; if (this->coverAlpha <= 0) { this->coverAlpha = 0; +#ifdef MM_N64_BOOT_LOGO + this->addAlpha = 12; +#else this->addAlpha = 3; +#endif } else if (this->coverAlpha >= 255) { this->coverAlpha = 255; this->exit = true; @@ -196,6 +200,10 @@ void ConsoleLogo_Init(GameState* thisx) { this->ult = 0; this->timer = 20; this->coverAlpha = 255; +#ifdef MM_N64_BOOT_LOGO + this->addAlpha = -12; +#else this->addAlpha = -3; +#endif this->visibleDuration = 0x3C; }