hackern64/HackerOoT
0
0
Fork 0
mirror of https://github.com/HackerN64/HackerOoT.git synced 2026-01-21 10:37:37 -08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into decomp_merge

Browse Source
This commit is contained in:
Yanis42
2023-09-23 13:19:14 +02:00
parent 9ccbc431ea be3121f821
commit bdd34a34d3
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/config/config_debug.h
View File

@@ -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.
*/

10
include/config/config_game.h
View File

@@ -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

8
src/overlays/gamestates/ovl_title/z_title.c
View File

@@ -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;
}