PublicMirrors/Starship
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Starship.git synced 2025-02-09 03:37:49 +03:00
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Fixed good luck screen

Browse Source
This commit is contained in:
KiritoDv 2024-11-15 21:31:49 -06:00
parent 95dcd6c1ca
commit e3e0a66620
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/fox_option.h
View File

@ -77,7 +77,7 @@ extern u8* gAssetMapPlanetTextures[9];
extern s32 gTotalHitsRanking[]; extern s32 gTotalHitsRanking[];
extern bool gGoToTitle; // engine extern bool gGoToTitle; // engine
extern bool sLevelStartState; extern u8 sLevelStartState;
extern s32 sWipeHeight; extern s32 sWipeHeight;
extern s32 sTitleRankMaxRecords; extern s32 sTitleRankMaxRecords;

2
src/mods/levelselect.c
View File

@ -3,7 +3,7 @@
extern PlanetId sPlanetList[15]; extern PlanetId sPlanetList[15];
extern PlanetId sCurrentPlanetId; extern PlanetId sCurrentPlanetId;
extern bool sLevelStartState; extern u8 sLevelStartState;
extern s32 D_menu_801CD968; extern s32 D_menu_801CD968;
extern s32 sMapState; extern s32 sMapState;
extern s32 sMapSubState; extern s32 sMapSubState;

4
src/overlays/ovl_menu/fox_option.c
View File

@ -979,7 +979,7 @@ void Option_MainMenu_Update(void) {
if (gControllerPress[gMainController].button & B_BUTTON) { if (gControllerPress[gMainController].button & B_BUTTON) {
AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_ARWING_CANCEL, gDefaultSfxSource, 4);
sWipeHeight = 0; sWipeHeight = 0;
sLevelStartState = true; sLevelStartState = 1;
sMainMenuState = 100; sMainMenuState = 100;
} }
break; break;
@ -1058,7 +1058,7 @@ void Option_MainMenu_Update(void) {
gTitleState = 0; gTitleState = 0;
gGoToTitle = true; gGoToTitle = true;
gDrawMode = DRAW_NONE; gDrawMode = DRAW_NONE;
sLevelStartState = false; sLevelStartState = 0;
sWipeHeight = 0; sWipeHeight = 0;
gControllerLock = 3; gControllerLock = 3;
} }

12
src/overlays/ovl_menu/fox_title.c
View File

@ -51,7 +51,7 @@ s32 gTotalHitsRanking[10];
u8 sRankNameEntry[10][4]; u8 sRankNameEntry[10][4];
UNK_TYPE D_menu_801B8270[3]; UNK_TYPE D_menu_801B8270[3];
bool gGoToTitle; bool gGoToTitle;
bool sLevelStartState; u8 sLevelStartState;
s32 sWipeHeight; s32 sWipeHeight;
s32 sTitleRankMaxRecords; s32 sTitleRankMaxRecords;
f32 D_menu_801B828C; f32 D_menu_801B828C;
@ -185,7 +185,7 @@ void Title_Setup(void) {
D_menu_801B833C = 0; D_menu_801B833C = 0;
sSceneState = 0; sSceneState = 0;
sLevelStartState = false; sLevelStartState = 0;
sTitleTextPrimColTarget = 255.0f; sTitleTextPrimColTarget = 255.0f;
sTitleTextPrimCol = 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)) { (START_BUTTON | A_BUTTON | B_BUTTON | D_CBUTTONS | L_CBUTTONS | U_CBUTTONS | R_CBUTTONS)) {
AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4); AUDIO_PLAY_SFX(NA_SE_DECIDE, gDefaultSfxSource, 4);
sWipeHeight = 0; sWipeHeight = 0;
sLevelStartState = true; sLevelStartState = 1;
gControllerLock = 30; gControllerLock = 30;
} }
break; break;
@ -3338,7 +3338,7 @@ void Title_NextState_TitleScreen(void) {
sCutsceneState = TITLE_SCREEN; sCutsceneState = TITLE_SCREEN;
gControllerLock = 30; gControllerLock = 30;
sWipeHeight = 0; sWipeHeight = 0;
sLevelStartState = false; sLevelStartState = 0;
} }
break; break;
} }
@ -3355,7 +3355,7 @@ void Title_NextState_OptionMenu(void) {
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 30); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_BGM, 30);
SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 30); SEQCMD_STOP_SEQUENCE(SEQ_PLAYER_FANFARE, 30);
sWipeHeight = 0; sWipeHeight = 0;
sLevelStartState = true; sLevelStartState = 1;
} }
break; break;
@ -3368,7 +3368,7 @@ void Title_NextState_OptionMenu(void) {
gOptionMenuStatus = OPTION_WAIT; gOptionMenuStatus = OPTION_WAIT;
gDrawMode = DRAW_NONE; gDrawMode = DRAW_NONE;
gStarCount = 0; gStarCount = 0;
sLevelStartState = false; sLevelStartState = 0;
sWipeHeight = 0; sWipeHeight = 0;
gControllerLock = 3; gControllerLock = 3;
} }

2
src/overlays/ovl_menu/fox_title.h
View File

@ -155,7 +155,7 @@ extern s32 gTotalHitsRanking[10];
extern u8 sRankNameEntry[10][4]; extern u8 sRankNameEntry[10][4];
extern UNK_TYPE D_menu_801B8270[3]; extern UNK_TYPE D_menu_801B8270[3];
extern bool gGoToTitle; extern bool gGoToTitle;
extern bool sLevelStartState; extern u8 sLevelStartState;
extern s32 sWipeHeight; extern s32 sWipeHeight;
extern s32 sTitleRankMaxRecords; extern s32 sTitleRankMaxRecords;
extern f32 D_menu_801B828C; extern f32 D_menu_801B828C;