Skip to content

Commit

Permalink
Merge pull request #34 from 07th-mod/switchable-bgm
Browse files Browse the repository at this point in the history
Use script-defined audio sets and in-built setup menu
  • Loading branch information
drojf authored Mar 28, 2021
2 parents d6e93a9 + 45442a2 commit a6b8e9c
Show file tree
Hide file tree
Showing 45 changed files with 544 additions and 218 deletions.
3 changes: 2 additions & 1 deletion Update/&endroll_staff7.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ void main()
Update(); //start the queued move without waiting for it
Wait(80000);

PlayBGM( 0, "higurashi", 28, 5000 );
ModPlayBGM( 0, "higurashi", 56, 5000, 0 );
ModPlayBGM( 0, "higurashi", 28, 5000, 1 );

Wait(80000);

Expand Down
19 changes: 13 additions & 6 deletions Update/_mina_001.txt
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ void main()
ClearMessage();

DrawScene( "white", 400 );
PlayBGM( 0, "semi", 28, 0 );
ModPlayBGM( 0, "semi", 56, 0, 0 );
ModPlayBGM( 2, "suzume", 56, 0, 0 );
ModPlayBGM( 0, "semi", 28, 0, 1 );
DrawSceneWithMask( "background/sora", "maskm1", 1, 0, 400 );

if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
Expand Down Expand Up @@ -221,11 +223,12 @@ void main()
OutputLine(NULL, " 羽入は申し訳なさそうに俯く。",
NULL, "Hanyuu muttered regretfully.", Line_Normal);
ClearMessage();
FadeOutBGM( 0, 300, FALSE );
ModFadeOutBGM( 0, 300, FALSE, 1 );

DrawScene( "white", 400 );
DrawSceneWithMask( "background/sora", "maskm1", 1, 0, 400 );
PlayBGM( 0, "it_moves", 56, 0 );
ModPlayBGM( 1, "it_moves", 56, 0, 0 );
ModPlayBGM( 0, "it_moves", 56, 0, 1 );

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " 昭和58年6月の中旬。",
Expand Down Expand Up @@ -463,7 +466,8 @@ void main()
ClearMessage();

DisableWindow();
PlayBGM( 1, "semi", 28, 0 );
ModFadeOutBGM( 1, 300, FALSE, 0 );
ModPlayBGM( 1, "semi", 28, 0, 1 );
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 );

Expand Down Expand Up @@ -590,7 +594,7 @@ void main()
OutputLine(NULL, " 世話焼きの好きな沙都子が厳しく言う。",
NULL, "Satoko warned me with a stern voice.", Line_Normal);
ClearMessage();
FadeOutBGM( 1, 300, FALSE );
ModFadeOutBGM( 1, 300, FALSE, 1 );

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " …本当に大した怪我ではないのだが、せっかく沙都子がこうまで言ってくれるのだから、顔を立てて頷くことにした。",
Expand Down Expand Up @@ -656,6 +660,7 @@ 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 );
ModPlayBGM( 1, "soul_scour", 56, 0, 0 );

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " 圭一も不安そうだったが、今この場で一番の年長者である自分が取り乱すわけにはいかないと思っているのだろう。",
Expand Down Expand Up @@ -1481,7 +1486,9 @@ void main()

CallScript( "&eyeCamp" );
FadeOutBGM( 0, 1000, FALSE );
FadeOutBGM( 1, 1000, TRUE );
ModFadeOutBGM( 1, 1000, FALSE, 0 );
ModFadeOutBGM( 2, 1000, TRUE, 0 );
ModFadeOutBGM( 1, 1000, TRUE, 1 );
SetValidityOfSkipping( FALSE );
DrawSceneWithMask( "tips/gettip_mina001", "mask1900", 7, 0, 400 );
Wait( 5000 );
Expand Down
48 changes: 35 additions & 13 deletions Update/_mina_002_1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ void main()
DrawScene( "black", 300 );
ClearMessage();

PlayBGM( 1, "semi", 28, 0 );
ModPlayBGM( 1, "semi", 56, 0, 0 );
ModPlayBGM( 1, "semi", 28, 0, 1 );
PlayBGM( 0, "Iru", 56, 0 );
ModPlayBGM( 2, "suzume", 56, 0, 0 );
DrawScene( "white", 1000 );
DrawScene( "background/sinryou_soto1", 1000 );
SetValidityOfInput( FALSE );
Expand Down Expand Up @@ -326,6 +328,7 @@ void main()
ClearMessage();

FadeOutBGM( 1, 400, FALSE );
ModFadeOutBGM( 2, 400, FALSE, 0 );
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 );
Expand Down Expand Up @@ -1774,7 +1777,9 @@ 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", 28, 0 );
ModPlayBGM( 1, "semi", 56, 0, 0 );
ModPlayBGM( 2, "suzume", 56, 0, 0 );
ModPlayBGM( 1, "semi", 28, 0, 1 );

if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(4, 4, "ps3/s12/04/180400046", 256, TRUE);
Expand Down Expand Up @@ -2339,7 +2344,7 @@ void main()

DisableWindow();
FadeOutBGM( 0, 300, FALSE );
FadeOutBGM( 1, 400, FALSE );
ModFadeOutBGM( 1, 400, FALSE, 1 );
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); }
Expand Down Expand Up @@ -2387,6 +2392,7 @@ void main()

DisableWindow();
ModDrawCharacterWithFiltering(1, 1, "sprite/kei2_warai_", "2", "maskleft", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );
ModPlayBGM( 0, "3", 56, 0, 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);
Expand Down Expand Up @@ -2414,8 +2420,9 @@ void main()
OutputLine(NULL, "近くの圭一に言い直したのだろう…。",
NULL, " So she decided to talk to Keiichi instead...", Line_Normal);
ClearMessage();
PlayBGM( 0, "it_moves", 56, 0 );


ModPlayBGM( 0, "it_moves", 56, 0, 1 );

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " ………………。",
NULL, ".........", Line_Normal);
Expand Down Expand Up @@ -2495,6 +2502,7 @@ void main()
NULL, "Keiichi joined the conversation, which finally brought us back to our normal pace.", Line_Normal);
ClearMessage();

ModFadeOutBGM( 0, 400, FALSE, 0 );
DrawScene( "background/mati_o2", 400 );

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
Expand Down Expand Up @@ -2739,6 +2747,7 @@ void main()
ClearMessage();

DrawScene( "background/mati_o2", 400 );
ModPlayBGM( 0, "Cafe", 56, 0, 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);
Expand Down Expand Up @@ -2846,7 +2855,7 @@ void main()


DrawSceneWithMask( "black", "maskdown", 1, 0, 1000 );
FadeOutBGM( 0, 300, FALSE );
ModFadeOutBGM( 0, 300, FALSE, 1 );

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " やがて魅音が、傾注傾注と言いながら手を叩いた。",
Expand Down Expand Up @@ -2876,13 +2885,14 @@ 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 );

ModPlayBGM( 0, "amber", 56, 0, 1 );

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));
Expand Down Expand Up @@ -3036,6 +3046,7 @@ void main()
NULL, " The winner from each table...\"", Line_Normal);
ClearMessage();

ModFadeOutBGM( 0, 300, FALSE, 0 );
DrawScene( "background/mati_o4", 300 );

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
Expand Down Expand Up @@ -3158,7 +3169,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 );
ModFadeOutBGM( 0, 300, FALSE, 1 );

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 );
Expand Down Expand Up @@ -3569,6 +3580,8 @@ void main()
ClearMessage();

DrawSceneWithMask( "black", "maskdown", 1, 0, 1000 );
ModFadeOutBGM( 1, 400, FALSE, 0 );
ModFadeOutBGM( 2, 400, TRUE, 0 );
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 );
Expand Down Expand Up @@ -3960,7 +3973,9 @@ 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", 28, 0 );
ModPlayBGM( 1, "semi", 56, 0, 0 );
ModPlayBGM( 2, "suzume", 56, 0, 0 );
ModPlayBGM( 1, "semi", 28, 0, 1 );

if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(4, 3, "ps3/s12/03/180300019", 256, TRUE);
Expand Down Expand Up @@ -4390,6 +4405,7 @@ void main()

DisableWindow();
FadeOutBGM( 1, 400, FALSE );
ModFadeOutBGM( 2, 400, FALSE, 0 );
Negative( 400 , TRUE );
PlayBGM( 1, "semi_r", 56, 0 );

Expand Down Expand Up @@ -4555,7 +4571,9 @@ void main()

FadeOutBGM( 1, 400, FALSE );
FadeFilm( 400, TRUE );
PlayBGM( 1, "semi", 28, 0 );
ModPlayBGM( 1, "semi", 56, 0, 0 );
ModPlayBGM( 2, "suzume", 56, 0, 0 );
ModPlayBGM( 1, "semi", 28, 0, 1 );

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " 目を開くと、……そこには魚釣りゲームが置かれていて、ご丁寧にも私の分の釣竿が私の前に置かれている。",
Expand Down Expand Up @@ -5050,6 +5068,7 @@ void main()

DisableWindow();
FadeOutBGM( 1, 300, FALSE );
ModFadeOutBGM( 2, 300, FALSE, 0 );
Negative( 300 , TRUE );
PlayBGM( 1, "kaze", 56, 0 );

Expand Down Expand Up @@ -5558,7 +5577,9 @@ void main()
SetValidityOfInput( FALSE );
Wait( 2000 );
SetValidityOfInput( TRUE );
PlayBGM( 1, "semi", 28, 0 );
ModPlayBGM( 1, "semi", 56, 0, 0 );
ModPlayBGM( 2, "suzume", 56, 0, 0 );
ModPlayBGM( 1, "semi", 28, 0, 1 );
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 );
Expand Down Expand Up @@ -5907,7 +5928,8 @@ void main()
FadeOutBGM( 2, 400, FALSE );
Negative( 400 , TRUE );
PlaySE( 0, "wa_011", 56, 64 );
PlayBGM( 1, "semi_r", 56, 0 );
ModPlayBGM( 1, "yabaisemi", 56, 0, 0 );
ModPlayBGM( 1, "semi_r", 56, 0, 1 );

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " 時間が凍る。",
Expand Down
4 changes: 3 additions & 1 deletion Update/_mina_002_1a.txt
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ void main()
DisableWindow();
FadeOutBGM( 1, 400, FALSE );
FadeFilm( 400 , TRUE );
PlayBGM( 1, "semi", 28, 0 );
ModPlayBGM( 1, "semi", 56, 0, 0 );
ModPlayBGM( 2, "suzume", 56, 0, 0 );
ModPlayBGM( 1, "semi", 28, 0, 1 );

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " 私は圭一に声を掛けようと近付く。",
Expand Down
7 changes: 5 additions & 2 deletions Update/_mina_002_1b.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ void main()
DisableWindow();
FadeOutBGM( 1, 400, FALSE );
FadeFilm( 400 , TRUE );
PlayBGM( 1, "semi", 28, 0 );
ModPlayBGM( 1, "semi", 56, 0, 0 );
ModPlayBGM( 2, "suzume", 56, 0, 0 );
ModPlayBGM( 1, "semi", 28, 0, 1 );

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " 圭一は、レナに渡すか魅音に渡すか、ほんの少しの戸惑いを見せた後、",
Expand All @@ -70,7 +72,8 @@ void main()
ClearMessage();

DisableWindow();
PlayBGM( 0, "03_cele", 56, 0 );
ModPlayBGM( 0, "t1", 56, 0, 0 );
ModPlayBGM( 0, "03_cele", 56, 0, 1 );
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 );

Expand Down
4 changes: 3 additions & 1 deletion Update/_mina_002_2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,9 @@ void main()

CallScript( "&eyeCamp" );
FadeOutBGM( 0, 1000, FALSE );
FadeOutBGM( 1, 1000, TRUE );
ModFadeOutBGM( 1, 1000, FALSE, 0 );
ModFadeOutBGM( 2, 1000, TRUE, 0 );
ModFadeOutBGM( 1, 1000, TRUE, 1 );
SetValidityOfSkipping( FALSE );
DrawSceneWithMask( "tips/gettip_mina002", "mask1900", 7, 0, 400 );
Wait( 5000 );
Expand Down
16 changes: 11 additions & 5 deletions Update/_mina_003_1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ void main()
ClearMessage();

DrawScene( "white", 1000 );
PlayBGM( 1, "suzume", 28, 0 );
ModPlayBGM( 1, "suzume", 56, 0, 0 );
ModPlayBGM( 1, "suzume", 28, 0, 1 );
DrawSceneWithMask( "background/ma1", "maskm1", 1, 0, 1300 );
PlayBGM( 0, "Cafe", 56, 0 );
SetValidityOfInput( FALSE );
Expand Down Expand Up @@ -301,7 +302,7 @@ void main()

DisableWindow();
FadeOutBGM( 0, 300, FALSE );
FadeOutBGM( 1, 300, FALSE );
ModFadeOutBGM( 1, 300, FALSE, 1 );
PlaySE( 0, "s_furu", 56, 64 );
// (backup) SetValidityOfInput( FALSE );
Wait( 150 );
Expand Down Expand Up @@ -935,7 +936,8 @@ 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", 28, 0 );
ModPlayBGM( 1, "suzume", 56, 0, 0 );
ModPlayBGM( 1, "suzume", 28, 0, 1 );
SetValidityOfInput( FALSE );
Wait( 150 );
SetValidityOfInput( TRUE );
Expand Down Expand Up @@ -1621,7 +1623,9 @@ void main()
OutputLine(NULL, "…忘れているような気がした。",
NULL, " I was forgetting something...", Line_Normal);
ClearMessage();
PlayBGM( 0, "semi", 28, 0 );
ModPlayBGM( 0, "semi", 56, 0, 0 );
ModPlayBGM( 2, "suzume", 56, 0, 0 );
ModPlayBGM( 0, "semi", 28, 0, 1 );

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " でも何の覚えもない。",
Expand Down Expand Up @@ -1759,8 +1763,10 @@ void main()
ClearMessage();

FadeOutBGM( 0, 400, FALSE );
ModFadeOutBGM( 2, 400, FALSE, 0 );
DrawScene( "black", 400 );
PlayBGM( 0, "amber", 56, 0 );
ModPlayBGM( 0, "msys15", 56, 0, 0 );
ModPlayBGM( 0, "amber", 56, 0, 1 );

if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
OutputLine(NULL, " 何でレナがおはぎなんか作るんだ…?",
Expand Down
11 changes: 8 additions & 3 deletions Update/_mina_003_2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,9 @@ 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", 28, 0 );
ModPlayBGM( 1, "semi", 56, 0, 0 );
ModPlayBGM( 2, "suzume", 56, 0, 0 );
ModPlayBGM( 1, "semi", 28, 0, 1 );

if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(4, 3, "ps3/s12/03/180300095", 256, TRUE);
Expand Down Expand Up @@ -202,7 +204,7 @@ void main()
NULL, "Even I didn't know.", Line_Normal);
ClearMessage();

FadeOutBGM( 1, 1000, FALSE );
ModFadeOutBGM( 1, 1000, FALSE, 1 );
PlayBGM( 0, "demo_48khz", 56, 0 );

if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
Expand Down Expand Up @@ -584,7 +586,10 @@ void main()
OutputLine(NULL, " 安堵するような微笑を浮かべてくれた。",
NULL, "She smiled as if she was relieved by my words.", Line_Normal);
ClearMessage();
FadeOutBGM( 0, 300, TRUE );
ModFadeOutBGM( 0, 300, TRUE, 1 );

CallScript( "&eye" );
ModFadeOutBGM( 0, 1000, FALSE, 0 );
ModFadeOutBGM( 1, 1000, FALSE, 0 );
ModFadeOutBGM( 2, 1000, TRUE, 0 );
}
Loading

0 comments on commit a6b8e9c

Please sign in to comment.