Merge pull request #29 from 07th-mod/feature/bgm-fix

Update/&endroll_staff7.txt

@@ -19,7 +19,7 @@ void main()
 	Update(); //start the queued move without waiting for it
 	Wait(80000);
 
-	PlayBGM( 0, "higurashi", 56, 5000 );
+	PlayBGM( 0, "higurashi", 28, 5000 );
 
 	Wait(80000);
 

Update/_mina_001.txt

@@ -31,8 +31,7 @@ void main()
 	ClearMessage();
 
 	DrawScene( "white", 400 );
-	PlayBGM( 0, "semi", 56, 0 );
-	PlayBGM( 2, "suzume", 56, 0 );
+	PlayBGM( 0, "semi", 28, 0 );
 	DrawSceneWithMask( "background/sora", "maskm1", 1, 0, 400 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
@@ -222,10 +221,11 @@ void main()
 	OutputLine(NULL, "　羽入は申し訳なさそうに俯く。",
 		   NULL, "Hanyuu muttered regretfully.", Line_Normal);
 	ClearMessage();
+	FadeOutBGM( 0, 300, FALSE );
 
 	DrawScene( "white", 400 );
 	DrawSceneWithMask( "background/sora", "maskm1", 1, 0, 400 );
-	PlayBGM( 1, "it_moves", 56, 0 );
+	PlayBGM( 0, "it_moves", 56, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　昭和５８年６月の中旬。",
@@ -463,7 +463,7 @@ void main()
 	ClearMessage();
 
 	DisableWindow();
-	FadeOutBGM( 1, 300, FALSE );
+	PlayBGM( 1, "semi", 28, 0 );
 	ModSetLayerFilter(2, 256, "none");
 	ModDrawCharacterWithFiltering(2, 2, "sprite/re2b_bikkuri_b1_", "1", "maskright", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE );
 
@@ -590,6 +590,7 @@ void main()
 	OutputLine(NULL, "　世話焼きの好きな沙都子が厳しく言う。",
 		   NULL, "Satoko warned me with a stern voice.", Line_Normal);
 	ClearMessage();
+	FadeOutBGM( 1, 300, FALSE );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　…本当に大した怪我ではないのだが、せっかく沙都子がこうまで言ってくれるのだから、顔を立てて頷くことにした。",
@@ -655,7 +656,6 @@ void main()
 
 	ModDrawCharacter(0, 1, "sprite/kei2_def2_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 5, 0, FALSE );
 	DrawScene( "background/mo1", 1000 );
-	PlayBGM( 1, "soul_scour", 56, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　圭一も不安そうだったが、今この場で一番の年長者である自分が取り乱すわけにはいかないと思っているのだろう。",
@@ -1481,8 +1481,7 @@ void main()
 
 	CallScript( "&eyeCamp" );
 	FadeOutBGM( 0, 1000, FALSE );
-	FadeOutBGM( 1, 1000, FALSE );
-	FadeOutBGM( 2, 1000, TRUE );
+	FadeOutBGM( 1, 1000, TRUE );
 	SetValidityOfSkipping( FALSE );
 	DrawSceneWithMask( "tips/gettip_mina001", "mask1900", 7, 0, 400 );
 	Wait( 5000 );

Update/_mina_002_1.txt

@@ -8,9 +8,8 @@ void main()
 	DrawScene( "black", 300 );
 	ClearMessage();
 
-	PlayBGM( 1, "semi", 56, 0 );
+	PlayBGM( 1, "semi", 28, 0 );
 	PlayBGM( 0, "Iru", 56, 0 );
-	PlayBGM( 2, "suzume", 56, 0 );
 	DrawScene( "white", 1000 );
 	DrawScene( "background/sinryou_soto1", 1000 );
 	SetValidityOfInput( FALSE );
@@ -327,7 +326,6 @@ void main()
 	ClearMessage();
 
 	FadeOutBGM( 1, 400, FALSE );
-	FadeOutBGM( 2, 400, FALSE );
 	ModSetLayerFilter(0, 256, "none");
 	ModDrawCharacter(0, 10, "sprite/iri2_def2_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 5, 0, FALSE );
 	DrawScene( "background/sinryou_sinsatu1", 400 );
@@ -1776,8 +1774,7 @@ void main()
 
 	ModDrawCharacter(0, 4, "sprite/sa2a_warai_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 5, 0, FALSE );
 	DrawScene( "background/sinryou_matiai1", 400 );
-	PlayBGM( 1, "semi", 56, 0 );
-	PlayBGM( 2, "suzume", 56, 0 );
+	PlayBGM( 1, "semi", 28, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 4, "ps3/s12/04/180400046", 256, TRUE);
@@ -2342,6 +2339,7 @@ void main()
 
 	DisableWindow();
 	FadeOutBGM( 0, 300, FALSE );
+	FadeOutBGM( 1, 400, FALSE );
 	ModDrawCharacter(0, 4, "sprite/sa2b_def_b1_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 5, 200, TRUE );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2389,7 +2387,6 @@ void main()
 
 	DisableWindow();
 	ModDrawCharacterWithFiltering(1, 1, "sprite/kei2_warai_", "2", "maskleft", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );
-	PlayBGM( 0, "3", 56, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 1, "ps3/s12/01/180100032", 256, TRUE);
@@ -2417,7 +2414,8 @@ void main()
 	OutputLine(NULL, "近くの圭一に言い直したのだろう…。",
 		   NULL, " So she decided to talk to Keiichi instead...", Line_Normal);
 	ClearMessage();
-
+	PlayBGM( 0, "it_moves", 56, 0 );
+
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　………………。",
 		   NULL, ".........", Line_Normal);
@@ -2497,7 +2495,6 @@ void main()
 		   NULL, "Keiichi joined the conversation, which finally brought us back to our normal pace.", Line_Normal);
 	ClearMessage();
 
-	FadeOutBGM( 0, 400, FALSE );
 	DrawScene( "background/mati_o2", 400 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2742,7 +2739,6 @@ void main()
 	ClearMessage();
 
 	DrawScene( "background/mati_o2", 400 );
-	PlayBGM( 0, "Cafe", 56, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 5, "ps3/s12/05/180500091", 256, TRUE);
@@ -2850,6 +2846,7 @@ void main()
 
 
 	DrawSceneWithMask( "black", "maskdown", 1, 0, 1000 );
+	FadeOutBGM( 0, 300, FALSE );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　やがて魅音が、傾注傾注と言いながら手を叩いた。",
@@ -2879,12 +2876,13 @@ void main()
 	OutputLine(NULL, "　すでに知っている展開を再びなぞることほど退屈で苦痛なことはないからだ。",
 		   NULL, "There's nothing more boring than to already know what was going to happen.", Line_Normal);
 	ClearMessage();
-
+	PlayBGM( 0, "amber", 56, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 5, "ps3/s12/05/180500094", 256, TRUE);
 	OutputLine(NULL, "「魅音の部活って、割と気まぐれなことが多いもの。",
 		   NULL, "\"Mion can be very capricious.", Line_WaitForInput);
+
 	ModPlayVoiceLS(4, 5, "ps3/s12/05/180500095", 256, TRUE);
 	OutputLine(NULL, "……ひょっとするとルールは違うこともあるかも…。」",
 		   NULL, " ......She really might change the rules.\"", GetGlobalFlag(GLinemodeSp));
@@ -3038,7 +3036,6 @@ void main()
 		   NULL, " The winner from each table...\"", Line_Normal);
 	ClearMessage();
 
-	FadeOutBGM( 0, 300, FALSE );
 	DrawScene( "background/mati_o4", 300 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -3161,6 +3158,7 @@ void main()
 	OutputLine(NULL, "　私は小さいため息をひとつ漏らすと、たとえジェスチャーだけでも、魅音の説明に耳を傾けるフリをするのだった。",
 		   NULL, "I sighed, and pretended as though I was listening to what Mion was explaining.", Line_Normal);
 	ClearMessage();
+	FadeOutBGM( 0, 300, FALSE );
 
 	DrawScene( "background/mati_o4", 300 );
 	ModDrawCharacterWithFiltering(2, 1, "sprite/kei2_def2_", "0", "maskleft", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE );
@@ -3571,8 +3569,6 @@ void main()
 	ClearMessage();
 
 	DrawSceneWithMask( "black", "maskdown", 1, 0, 1000 );
-	FadeOutBGM( 1, 400, FALSE );
-	FadeOutBGM( 2, 400, TRUE );
 	ModSetLayerFilter(0, 256, "none");
 	ModDrawCharacter(0, 3, "sprite/me2_wink_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 5, 0, FALSE );
 	DrawScene( "background/mati_o4", 400 );
@@ -3964,8 +3960,7 @@ void main()
 	FadeOutBGM( 0, 400, FALSE );
 	FadeBustshot( 3, FALSE, 0, 0, 0, 0, 400, TRUE );
 	ModDrawCharacter(0, 3, "sprite/me2_tokui_a1_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 5, 200, TRUE );
-	PlayBGM( 1, "semi", 56, 0 );
-	PlayBGM( 2, "suzume", 56, 0 );
+	PlayBGM( 1, "semi", 28, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 3, "ps3/s12/03/180300019", 256, TRUE);
@@ -4395,7 +4390,6 @@ void main()
 
 	DisableWindow();
 	FadeOutBGM( 1, 400, FALSE );
-	FadeOutBGM( 2, 400, FALSE );
 	Negative( 400 , TRUE );
 	PlayBGM( 1, "semi_r", 56, 0 );
 
@@ -4561,8 +4555,7 @@ void main()
 
 	FadeOutBGM( 1, 400, FALSE );
 	FadeFilm( 400, TRUE );
-	PlayBGM( 1, "semi", 56, 0 );
-	PlayBGM( 2, "suzume", 56, 0 );
+	PlayBGM( 1, "semi", 28, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　目を開くと、……そこには魚釣りゲームが置かれていて、ご丁寧にも私の分の釣竿が私の前に置かれている。",
@@ -5057,7 +5050,6 @@ void main()
 
 	DisableWindow();
 	FadeOutBGM( 1, 300, FALSE );
-	FadeOutBGM( 2, 300, FALSE );
 	Negative( 300 , TRUE );
 	PlayBGM( 1, "kaze", 56, 0 );
 
@@ -5566,8 +5558,7 @@ void main()
 	SetValidityOfInput( FALSE );
 	Wait( 2000 );
 	SetValidityOfInput( TRUE );
-	PlayBGM( 1, "semi", 56, 0 );
-	PlayBGM( 2, "suzume", 56, 0 );
+	PlayBGM( 1, "semi", 28, 0 );
 	DrawScene( "white", 1000 );
 	ModDrawCharacter(1, 3, "sprite/me2_tohoho_a1_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, FALSE );
 	ModDrawCharacter(2, 1, "sprite/kei2_def1_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE );
@@ -5916,7 +5907,7 @@ void main()
 	FadeOutBGM( 2, 400, FALSE );
 	Negative( 400 , TRUE );
 	PlaySE( 0, "wa_011", 56, 64 );
-	PlayBGM( 1, "yabaisemi", 56, 0 );
+	PlayBGM( 1, "semi_r", 56, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　時間が凍る。",

Update/_mina_002_1a.txt

@@ -78,8 +78,7 @@ void main()
 	DisableWindow();
 	FadeOutBGM( 1, 400, FALSE );
 	FadeFilm( 400 , TRUE );
-	PlayBGM( 1, "semi", 56, 0 );
-	PlayBGM( 2, "suzume", 56, 0 );
+	PlayBGM( 1, "semi", 28, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　私は圭一に声を掛けようと近付く。",

Update/_mina_002_1b.txt

@@ -57,8 +57,7 @@ void main()
 	DisableWindow();
 	FadeOutBGM( 1, 400, FALSE );
 	FadeFilm( 400 , TRUE );
-	PlayBGM( 1, "semi", 56, 0 );
-	PlayBGM( 2, "suzume", 56, 0 );
+	PlayBGM( 1, "semi", 28, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　圭一は、レナに渡すか魅音に渡すか、ほんの少しの戸惑いを見せた後、",
@@ -71,7 +70,7 @@ void main()
 	ClearMessage();
 
 	DisableWindow();
-	PlayBGM( 0, "t1", 56, 0 );
+	PlayBGM( 0, "03_cele", 56, 0 );
 	ModSetLayerFilter(2, 256, "none");
 	ModDrawCharacter(2, 1, "sprite/kei2_warai_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
 

Update/_mina_002_2.txt

@@ -413,8 +413,7 @@ void main()
 
 	CallScript( "&eyeCamp" );
 	FadeOutBGM( 0, 1000, FALSE );
-	FadeOutBGM( 1, 1000, FALSE );
-	FadeOutBGM( 2, 1000, TRUE );
+	FadeOutBGM( 1, 1000, TRUE );
 	SetValidityOfSkipping( FALSE );
 	DrawSceneWithMask( "tips/gettip_mina002", "mask1900", 7, 0, 400 );
 	Wait( 5000 );

Update/_mina_003_1.txt

@@ -9,7 +9,7 @@ void main()
 	ClearMessage();
 
 	DrawScene( "white", 1000 );
-	PlayBGM( 1, "suzume", 56, 0 );
+	PlayBGM( 1, "suzume", 28, 0 );
 	DrawSceneWithMask( "background/ma1", "maskm1", 1, 0, 1300 );
 	PlayBGM( 0, "Cafe", 56, 0 );
 	SetValidityOfInput( FALSE );
@@ -301,6 +301,7 @@ void main()
 
 	DisableWindow();
 	FadeOutBGM( 0, 300, FALSE );
+	FadeOutBGM( 1, 300, FALSE );
 	PlaySE( 0, "s_furu", 56, 64 );
 	// (backup) SetValidityOfInput( FALSE );
 	Wait( 150 );
@@ -934,7 +935,7 @@ void main()
 	StartShakingOfWindow( 245, 40, 0, 0, 4*2, FALSE );
 	StartShakingOfAllObjects( 245, 40, 0, 0, 4*2, TRUE );
 	PlayBGM( 0, "cafe", 56, 0 );
-	PlayBGM( 1, "suzume", 56, 0 );
+	PlayBGM( 1, "suzume", 28, 0 );
 	SetValidityOfInput( FALSE );
 	Wait( 150 );
 	SetValidityOfInput( TRUE );
@@ -1620,8 +1621,7 @@ void main()
 	OutputLine(NULL, "…忘れているような気がした。",
 		   NULL, " I was forgetting something...", Line_Normal);
 	ClearMessage();
-	PlayBGM( 0, "semi", 56, 0 );
-	PlayBGM( 2, "suzume", 56, 0 );
+	PlayBGM( 0, "semi", 28, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　でも何の覚えもない。",
@@ -1759,9 +1759,8 @@ void main()
 	ClearMessage();
 
 	FadeOutBGM( 0, 400, FALSE );
-	FadeOutBGM( 2, 400, FALSE );
 	DrawScene( "black", 400 );
-	PlayBGM( 0, "msys15", 56, 0 );
+	PlayBGM( 0, "amber", 56, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　何でレナがおはぎなんか作るんだ…？",

Update/_mina_003_2.txt

@@ -149,8 +149,7 @@ void main()
 	ModSetLayerFilter(2, 256, "none");
 	ModDrawCharacter(2, 3, "sprite/me1a_yowaki_a1_", "2", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE );
 	DrawSceneWithMask( "background/gk3", "maskleft", 1, 0, 300 );
-	PlayBGM( 1, "semi", 56, 0 );
-	PlayBGM( 2, "suzume", 56, 0 );
+	PlayBGM( 1, "semi", 28, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 3, "ps3/s12/03/180300095", 256, TRUE);
@@ -203,6 +202,7 @@ void main()
 		   NULL, "Even I didn't know.", Line_Normal);
 	ClearMessage();
 
+	FadeOutBGM( 1, 1000, FALSE );
 	PlayBGM( 0, "demo_48khz", 56, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
@@ -584,9 +584,7 @@ void main()
 	OutputLine(NULL, "　安堵するような微笑を浮かべてくれた。",
 		   NULL, "She smiled as if she was relieved by my words.", Line_Normal);
 	ClearMessage();
+	FadeOutBGM( 0, 300, TRUE );
 
 	CallScript( "&eye" );
-	FadeOutBGM( 0, 1000, FALSE );
-	FadeOutBGM( 1, 1000, FALSE );
-	FadeOutBGM( 2, 1000, TRUE );
 }

Update/_mina_004.txt

@@ -732,7 +732,7 @@ void main()
 	FadeOutBGM( 0, 300, FALSE );
 	FadeBustshotWithFiltering( 1, "maskright" , 1, FALSE, 0, 0, 300, TRUE );
 	ModDrawCharacterWithFiltering(1, 5, "sprite/ri2_def_a1_", "0", "maskleft", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );
-	PlayBGM( 1, "higurashi", 56, 0 );
+	PlayBGM( 1, "higurashi", 28, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 5, "ps3/s12/05/180500223", 256, TRUE);
@@ -756,7 +756,7 @@ void main()
 	ClearMessage();
 
 	DrawScene( "black", 1000 );
-	PlayBGM( 0, "msys17", 56, 0 );
+	PlayBGM( 0, "it_moves", 56, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　私はこのまま、ずっと何もせずうじうじしていたらどうなるかを、夢の中で想像した。",
@@ -1205,7 +1205,6 @@ void main()
 		   NULL, "We all nodded at her, without joking around.", Line_Normal);
 	ClearMessage();
 
-	FadeOutBGM( 0, 400, FALSE );
 	DrawScene( "background/js4", 400 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -1423,7 +1422,6 @@ void main()
 	ModSetLayerFilter(1, 256, "sunset");
 	ModDrawCharacter(1, 3, "sprite/me2_def_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, FALSE );
 	DrawScene( "background/js4_01", 400 );
-	PlayBGM( 0, "z2_hig2", 56, 0 );
 
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 3, "ps3/s12/03/180300128", 256, TRUE);
@@ -2014,7 +2012,7 @@ void main()
 	FadeOutBGM( 0, 1000, FALSE );
 	FadeOutBGM( 1, 1000, TRUE );
 	DrawScene( "background/jyt2", 1000 );
-	PlayBGM( 1, "yoru", 56, 0 );
+	PlayBGM( 1, "yoru", 28, 0 );
 	SetValidityOfInput( FALSE );
 	Wait( 2000 );
 	SetValidityOfInput( TRUE );