Merge branch 'staging' into dokomi2023

src/cutscenes/cutscene.c

@@ -470,6 +470,7 @@ void cutscene_enter(CallChain next, CutsceneID id) {
 	CutsceneState *st = cutscene_state_new(cs->phases);
 	st->cc = next;
 	st->bg_state.transition_rate = 1/80.0f;
+	progress_unlock_bgm(cs->bgm);
 	audio_bgm_play(res_bgm(cs->bgm), true, 0, 1);
 	eventloop_enter(st, cutscene_logic_frame, cutscene_render_frame, cutscene_end_loop, FPS);
 }

src/menu/musicroom.c

@@ -270,6 +270,7 @@ MenuData *create_musicroom_menu(void) {
 	m->context = ctx;
 
 	for(int preload = 1; preload >= 0; --preload) {
+		add_bgm(m, "intro", preload);
 		add_bgm(m, "menu", preload);
 		add_bgm(m, "stage1", preload);
 		add_bgm(m, "stage1boss", preload);

src/progress.c

@@ -853,6 +853,7 @@ static ProgressBGMID progress_bgm_id(const char *bgm) {
 		[PBGM_BONUS0]       = "bonus0",
 		[PBGM_BONUS1]       = "scuttle",
 		[PBGM_GAMEOVER]     = "gameover",
+		[PBGM_INTRO]        = "intro",
 	};
 
 	for(int i = 0; i < ARRAY_SIZE(map); ++i) {

src/progress.h

@@ -62,6 +62,7 @@ typedef enum ProgressBGMID {
 	PBGM_BONUS0,  // old Iku theme
 	PBGM_BONUS1,  // Scuttle theme
 	PBGM_GAMEOVER,
+	PBGM_INTRO,
 } ProgressBGMID;
 
 struct UnknownCmd;