izzy/2ship2harkinian-Android
0
0
Fork 0
mirror of https://github.com/izzy2lost/2ship2harkinian-Android.git synced 2026-06-19 01:20:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add bgm's to gSaveContext.seqIndex

Browse Source
This commit is contained in:
engineer124
2021-11-19 22:45:36 +11:00
parent a0882f3fd3
commit 5cc0ff2d64
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_common_data.c
+1 -1
View File
@@ -5,7 +5,7 @@ SaveContext gSaveContext;
void SaveContext_Init(void) {
bzero(&gSaveContext, sizeof(gSaveContext));
gSaveContext.playerForm = 0;
gSaveContext.seqIndex = 0xFF;
gSaveContext.seqIndex = (u8)NA_BGM_DISABLED;
gSaveContext.nightSeqIndex = 0xFF;
gSaveContext.unk_3F46 = NA_BGM_GENERAL_SFX;
gSaveContext.nextCutsceneIndex = 0xFFEF;
src/code/z_game_over.c
+1 -1
View File
@@ -45,7 +45,7 @@ void GameOver_Update(GlobalContext* globalCtx) {
gSaveContext.unk_3DC0 = 2000;
gSaveContext.naviTimer = 0;
gSaveContext.seqIndex = 0xFF;
gSaveContext.seqIndex = (u8)NA_BGM_DISABLED;
gSaveContext.nightSeqIndex = 0xFF;
gSaveContext.eventInf[0] = 0;
gSaveContext.eventInf[1] = 0;
src/code/z_scene.c
+1 -1
View File
@@ -449,7 +449,7 @@ void Scene_HeaderCmdSoundSettings(GlobalContext* globalCtx, SceneCmd* cmd) {
globalCtx->soundCtx.seqIndex = cmd->soundSettings.musicSeq;
globalCtx->soundCtx.nightSeqIndex = cmd->soundSettings.nighttimeSFX;
if (gSaveContext.seqIndex == 0xFF || func_801A8A50(0) == NA_BGM_FINAL_HOURS) {
if (gSaveContext.seqIndex == (u8)NA_BGM_DISABLED || func_801A8A50(0) == NA_BGM_FINAL_HOURS) {
audio_setBGM(cmd->soundSettings.bgmId);
}
}
src/overlays/gamestates/ovl_select/z_select.c
+1 -1
View File
@@ -45,7 +45,7 @@ void Select_LoadGame(SelectContext* this, u32 entranceIndex, s32 opt) {
}
gSaveContext.respawn[0].entranceIndex = 0xFFFF;
gSaveContext.seqIndex = 0xFF;
gSaveContext.seqIndex = (u8)NA_BGM_DISABLED;
gSaveContext.nightSeqIndex = 0xFF;
gSaveContext.showTitleCard = true;
gSaveContext.respawnFlag = 0;
src/overlays/gamestates/ovl_title/z_title.c
+1 -1
View File
@@ -127,7 +127,7 @@ void Title_Main(GameState* thisx) {
Title_UpdateCounters(this);
Title_Draw(&this->gameState);
if (this->exit) {
gSaveContext.seqIndex = 0xFF;
gSaveContext.seqIndex = (u8)NA_BGM_DISABLED;
gSaveContext.nightSeqIndex = 0xFF;
gSaveContext.gameMode = 1;