mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-02-24 14:51:46 -05:00
Code Issues Projects Releases Wiki Activity

clean up logic to better handle changing boot sequence settings

Browse Source
This commit is contained in:
briaguya 2025-01-22 01:54:30 -05:00
parent ff0b7e24e4
commit 9476e56911
1 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
soh/soh/Enhancements/cosmetics/CustomLogoTitle.cpp
View File

@ -120,9 +120,23 @@ extern "C" void CustomLogoTitle_Draw(TitleContext* titleContext, uint8_t logoToD
CLOSE_DISPS(titleContext->state.gfxCtx); CLOSE_DISPS(titleContext->state.gfxCtx);
} }
#define CVAR_BOOTSEQUENCE_NAME CVAR_ENHANCEMENT("BootSequence")
#define CVAR_BOOTSEQUENCE_DEFAULT BOOTSEQUENCE_DEFAULT
#define CVAR_BOOTSEQUENCE_VALUE CVarGetInteger(CVAR_BOOTSEQUENCE_NAME, CVAR_BOOTSEQUENCE_DEFAULT)
extern "C" void CustomLogoTitle_Main(TitleContext* titleContext) { extern "C" void CustomLogoTitle_Main(TitleContext* titleContext) {
static uint8_t logoToDraw = LOGO_TO_DRAW_LUS; static uint8_t logosSeen = 0;
if (CVarGetInteger(CVAR_ENHANCEMENT("BootSequence"), BOOTSEQUENCE_DEFAULT) == BOOTSEQUENCE_AUTHENTIC) { uint8_t logoToDraw;
if (CVAR_BOOTSEQUENCE_VALUE == BOOTSEQUENCE_DEFAULT) {
if (logosSeen == 0) {
logoToDraw = LOGO_TO_DRAW_LUS;
} else {
logoToDraw = LOGO_TO_DRAW_N64;
}
}
if (CVAR_BOOTSEQUENCE_VALUE == BOOTSEQUENCE_AUTHENTIC) {
logoToDraw = LOGO_TO_DRAW_N64; logoToDraw = LOGO_TO_DRAW_N64;
} }
@ -140,24 +154,16 @@ extern "C" void CustomLogoTitle_Main(TitleContext* titleContext) {
gSaveContext.gameMode = 1; gSaveContext.gameMode = 1;
titleContext->state.running = false; titleContext->state.running = false;
// default boot sequence is lus -> n64 -> opening logosSeen++;
if (CVarGetInteger(CVAR_ENHANCEMENT("BootSequence"), BOOTSEQUENCE_DEFAULT) == BOOTSEQUENCE_DEFAULT) {
// if we're drawing the n64 logo in the default boot sequence
if (logoToDraw == LOGO_TO_DRAW_N64) {
// go to the opening next
SET_NEXT_GAMESTATE(&titleContext->state, Opening_Init, OpeningContext);
// make sure to draw the lus logo on reset if (CVAR_BOOTSEQUENCE_VALUE == BOOTSEQUENCE_DEFAULT && logosSeen == 1) {
logoToDraw = LOGO_TO_DRAW_LUS;
} else { // we're drawing the lus logo
// go to the title again
SET_NEXT_GAMESTATE(&titleContext->state, Title_Init, TitleContext); SET_NEXT_GAMESTATE(&titleContext->state, Title_Init, TitleContext);
// draw the n64 logo this time
logoToDraw = LOGO_TO_DRAW_N64;
} }
} else { // we're doing the authentic boot sequence, just n64 -> opening
if ((CVAR_BOOTSEQUENCE_VALUE == BOOTSEQUENCE_DEFAULT && logosSeen == 2) ||
(CVAR_BOOTSEQUENCE_VALUE == BOOTSEQUENCE_AUTHENTIC)) {
SET_NEXT_GAMESTATE(&titleContext->state, Opening_Init, OpeningContext); SET_NEXT_GAMESTATE(&titleContext->state, Opening_Init, OpeningContext);
logosSeen = 0;
} }
} }
@ -208,10 +214,6 @@ void OnZTitleUpdateSkipToFileSelect(void* gameState) {
SET_NEXT_GAMESTATE(&titleContext->state, FileChoose_Init, FileChooseContext); SET_NEXT_GAMESTATE(&titleContext->state, FileChoose_Init, FileChooseContext);
} }
#define CVAR_BOOTSEQUENCE_NAME CVAR_ENHANCEMENT("BootSequence")
#define CVAR_BOOTSEQUENCE_DEFAULT BOOTSEQUENCE_DEFAULT
#define CVAR_BOOTSEQUENCE_VALUE CVarGetInteger(CVAR_BOOTSEQUENCE_NAME, CVAR_BOOTSEQUENCE_DEFAULT)
void RegisterCustomLogoTitleBootsequence() { void RegisterCustomLogoTitleBootsequence() {
COND_HOOK(OnZTitleUpdate, CVAR_BOOTSEQUENCE_VALUE == BOOTSEQUENCE_FILESELECT, OnZTitleUpdateSkipToFileSelect); COND_HOOK(OnZTitleUpdate, CVAR_BOOTSEQUENCE_VALUE == BOOTSEQUENCE_FILESELECT, OnZTitleUpdateSkipToFileSelect);
} }