From e3e0a666206f2f19275e02cf4d4bde0474fa9c92 Mon Sep 17 00:00:00 2001 From: KiritoDv Date: Fri, 15 Nov 2024 21:31:49 -0600 Subject: [PATCH] Fixed good luck screen --- include/fox_option.h | 2 +- src/mods/levelselect.c | 2 +- src/overlays/ovl_menu/fox_option.c | 4 ++-- src/overlays/ovl_menu/fox_title.c | 12 ++++++------ src/overlays/ovl_menu/fox_title.h | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/fox_option.h b/include/fox_option.h index 97f59aa6..51e23099 100644 --- a/include/fox_option.h +++ b/include/fox_option.h @@ -77,7 +77,7 @@ extern u8* gAssetMapPlanetTextures[9]; extern s32 gTotalHitsRanking[]; extern bool gGoToTitle; // engine -extern bool sLevelStartState; +extern u8 sLevelStartState; extern s32 sWipeHeight; extern s32 sTitleRankMaxRecords; diff --git a/src/mods/levelselect.c b/src/mods/levelselect.c index 50d0e07e..ad562096 100644 --- a/src/mods/levelselect.c +++ b/src/mods/levelselect.c @@ -3,7 +3,7 @@ extern PlanetId sPlanetList[15]; extern PlanetId sCurrentPlanetId; -extern bool sLevelStartState; +extern u8 sLevelStartState; extern s32 D_menu_801CD968; extern s32 sMapState; extern s32 sMapSubState; diff --git a/src/overlays/ovl_menu/fox_option.c b/src/overlays/ovl_menu/fox_option.c index 122f26e3..ae878593 100644 --- a/src/overlays/ovl_menu/fox_option.c +++ b/src/overlays/ovl_menu/fox_option.c @@ -979,7 +979,7 @@ void Option_MainMenu_Update(void) { if (gControllerPress[gMainController].button & B_BUTTON) { AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4); sWipeHeight = 0; - sLevelStartState = true; + sLevelStartState = 1; sMainMenuState = 100; } break; @@ -1058,7 +1058,7 @@ void Option_MainMenu_Update(void) { gTitleState = 0; gGoToTitle = true; gDrawMode = DRAW_NONE; - sLevelStartState = false; + sLevelStartState = 0; sWipeHeight = 0; gControllerLock = 3; } diff --git a/src/overlays/ovl_menu/fox_title.c b/src/overlays/ovl_menu/fox_title.c index 5b62ecfb..d819bba8 100644 --- a/src/overlays/ovl_menu/fox_title.c +++ b/src/overlays/ovl_menu/fox_title.c @@ -51,7 +51,7 @@ s32 gTotalHitsRanking[10]; u8 sRankNameEntry[10][4]; UNK_TYPE D_menu_801B8270[3]; bool gGoToTitle; -bool sLevelStartState; +u8 sLevelStartState; s32 sWipeHeight; s32 sTitleRankMaxRecords; f32 D_menu_801B828C; @@ -185,7 +185,7 @@ void Title_Setup(void) { D_menu_801B833C = 0; sSceneState = 0; - sLevelStartState = false; + sLevelStartState = 0; sTitleTextPrimColTarget = 255.0f; sTitleTextPrimCol = 255.0f; @@ -3321,7 +3321,7 @@ void Title_NextState_TitleScreen(void) { (START_BUTTON | A_BUTTON | B_BUTTON | D_CBUTTONS | L_CBUTTONS | U_CBUTTONS | R_CBUTTONS)) { AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4); sWipeHeight = 0; - sLevelStartState = true; + sLevelStartState = 1; gControllerLock = 30; } break; @@ -3338,7 +3338,7 @@ void Title_NextState_TitleScreen(void) { sCutsceneState = TITLE_SCREEN; gControllerLock = 30; sWipeHeight = 0; - sLevelStartState = false; + sLevelStartState = 0; } break; } @@ -3355,7 +3355,7 @@ void Title_NextState_OptionMenu(void) { SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 30); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 30); sWipeHeight = 0; - sLevelStartState = true; + sLevelStartState = 1; } break; @@ -3368,7 +3368,7 @@ void Title_NextState_OptionMenu(void) { gOptionMenuStatus = OPTION_WAIT; gDrawMode = DRAW_NONE; gStarCount = 0; - sLevelStartState = false; + sLevelStartState = 0; sWipeHeight = 0; gControllerLock = 3; } diff --git a/src/overlays/ovl_menu/fox_title.h b/src/overlays/ovl_menu/fox_title.h index f6f33717..4e222623 100644 --- a/src/overlays/ovl_menu/fox_title.h +++ b/src/overlays/ovl_menu/fox_title.h @@ -155,7 +155,7 @@ extern s32 gTotalHitsRanking[10]; extern u8 sRankNameEntry[10][4]; extern UNK_TYPE D_menu_801B8270[3]; extern bool gGoToTitle; -extern bool sLevelStartState; +extern u8 sLevelStartState; extern s32 sWipeHeight; extern s32 sTitleRankMaxRecords; extern f32 D_menu_801B828C;