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

boot sequence logic

Browse Source
This commit is contained in:
briaguya 2025-01-22 01:38:42 -05:00
parent a8d29a2ae3
commit ff0b7e24e4
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,7 +121,6 @@ extern "C" void CustomLogoTitle_Draw(TitleContext* titleContext, uint8_t logoToD
} }
extern "C" void CustomLogoTitle_Main(TitleContext* titleContext) { extern "C" void CustomLogoTitle_Main(TitleContext* titleContext) {
static uint8_t logosDrawn = 0;
static uint8_t logoToDraw = LOGO_TO_DRAW_LUS; static uint8_t logoToDraw = LOGO_TO_DRAW_LUS;
if (CVarGetInteger(CVAR_ENHANCEMENT("BootSequence"), BOOTSEQUENCE_DEFAULT) == BOOTSEQUENCE_AUTHENTIC) { if (CVarGetInteger(CVAR_ENHANCEMENT("BootSequence"), BOOTSEQUENCE_DEFAULT) == BOOTSEQUENCE_AUTHENTIC) {
logoToDraw = LOGO_TO_DRAW_N64; logoToDraw = LOGO_TO_DRAW_N64;
@ -141,7 +140,25 @@ extern "C" void CustomLogoTitle_Main(TitleContext* titleContext) {
gSaveContext.gameMode = 1; gSaveContext.gameMode = 1;
titleContext->state.running = false; titleContext->state.running = false;
SET_NEXT_GAMESTATE(&titleContext->state, Opening_Init, OpeningContext); // default boot sequence is lus -> n64 -> opening
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
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);
// draw the n64 logo this time
logoToDraw = LOGO_TO_DRAW_N64;
}
} else { // we're doing the authentic boot sequence, just n64 -> opening
SET_NEXT_GAMESTATE(&titleContext->state, Opening_Init, OpeningContext);
}
} }
GameInteractor_ExecuteOnZTitleUpdate(titleContext); GameInteractor_ExecuteOnZTitleUpdate(titleContext);