Skip to content

Commit

Permalink
Remove usage of duplicate CGs
Browse files Browse the repository at this point in the history
  • Loading branch information
enumag committed May 7, 2017
1 parent ae38122 commit 9253c45
Show file tree
Hide file tree
Showing 26 changed files with 259 additions and 259 deletions.
34 changes: 17 additions & 17 deletions Update/omake_03.txt
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ void main()
ClearMessage();
//<魅音
DisableWindow();
DrawSceneWithMask( "bg_166", "right", 0, 0, 300 );
DrawSceneWithMask( "bg_165", "right", 0, 0, 300 );
DrawBustshotWithFiltering( 3, "re_se_na_a1", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );

//「あれれ...@ バッドエンドって割には、魅ぃちゃんは楽しそうだね。@
Expand Down Expand Up @@ -151,7 +151,7 @@ void main()
ClearMessage();
//<大石
DisableWindow();
DrawSceneWithMask( "bg_163", "left", 0, 0, 300 );
DrawSceneWithMask( "bg_161", "left", 0, 0, 300 );
DrawBustshotWithFiltering( 1, "ri_se_wa_a1", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );

//「......みんな仲良しで死んじゃったのですよ@仲良しなのです、にぱ~☆@
Expand Down Expand Up @@ -211,7 +211,7 @@ void main()
NULL, "\"\"\"Wah-ha-ha-ha-ha-ha-ha!!\"\"\"", Line_Normal);
ClearMessage();
DisableWindow();
DrawSceneWithMask( "bg_166", "right", 0, 0, 300 );
DrawSceneWithMask( "bg_165", "right", 0, 0, 300 );
PlayBGM( 1, "msys01", 128, 0 );
DrawBustshotWithFiltering( 3, "re_se_wa_b1", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );

Expand Down Expand Up @@ -319,7 +319,7 @@ void main()
DisableWindow();
DrawScene( "black", 400 );
DrawBustshot( 3, "me_se_wa_b1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, FALSE );
DrawSceneWithMask( "bg_163", "up", 0, 0, 300 );
DrawSceneWithMask( "bg_161", "up", 0, 0, 300 );

//「さて@ これでとりあえず全員揃ったね@  レナ@ また乾杯をよろしくね!¥
PlaySE(4, "s20/03/440300364", 128, 64);
Expand Down Expand Up @@ -378,7 +378,7 @@ void main()

//<知恵
DisableWindow();
DrawSceneWithMask( "bg_166", "right", 0, 0, 300 );
DrawSceneWithMask( "bg_165", "right", 0, 0, 300 );
DrawBustshotWithFiltering( 1, "tm_si_wa_a1", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );

//「未成年陣と成年陣の人数比がこれでやっと互角かな@ これで胸を張ってアルコールが飲めるね!@
Expand Down Expand Up @@ -519,7 +519,7 @@ void main()

//<詩音
DisableWindow();
DrawBustshotWithFiltering( 1, "sa_se_wa_b1", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );
DrawBustshotWithFiltering( 1, "sa_se_ha_b2", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );

//「ハイハイ@ 皆さん、ご清聴ですわよ~~!!@
PlaySE(4, "s20/04/440400216", 128, 64);
Expand Down Expand Up @@ -571,7 +571,7 @@ void main()
DrawSceneWithMask( "black", "right", 0, 0, 300 );
FadeOutBGM( 1, 1000, FALSE );
FadeOutBGM( 2, 1000, TRUE );
DrawSceneWithMask( "bg_163", "right", 0, 0, 300 );
DrawSceneWithMask( "bg_161", "right", 0, 0, 300 );
PlayBGM( 1, "msys02", 128, 0 );
DrawBustshotWithFiltering( 1,"oi_si_de_a2", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );

Expand Down Expand Up @@ -614,7 +614,7 @@ void main()
ClearMessage();
//<魅音
DisableWindow();
DrawSceneWithMask( "bg_166", "left", 0, 0, 300 );
DrawSceneWithMask( "bg_165", "left", 0, 0, 300 );
DrawBustshotWithFiltering( 3, "ta_si_de_a1", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );

//「......じゃあ私が先陣を切ろうかしら@/
Expand Down Expand Up @@ -757,7 +757,7 @@ void main()
ClearMessage();
//<魅音
DisableWindow();
DrawSceneWithMask( "bg_163", "right", 0, 0, 300 );
DrawSceneWithMask( "bg_161", "right", 0, 0, 300 );
DrawBustshotWithFiltering( 3, "ir_si_de_a1", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );

//「『ひぐらし』の物語は、微細に異なる場所もありますけど@大筋の設定においては、多分、3つのシナリオは共通していると思います@例えば、キャラクター設定。@
Expand Down Expand Up @@ -817,7 +817,7 @@ void main()
ClearMessage();
//<梨花
DisableWindow();
DrawSceneWithMask( "bg_166", "right", 0, 0, 300 );
DrawSceneWithMask( "bg_165", "right", 0, 0, 300 );
DrawBustshotWithFiltering( 1, "ti_si_de_a1", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );

//「綿流し編で、お祭りの最中に鷹野さんと富竹さんが祭具殿に忍び込む、というシーンがありますけど@...あのシーンも、他のシナリオでは描かれなかっただけで、起こったことになってるのかもしれませんね。@
Expand Down Expand Up @@ -890,7 +890,7 @@ void main()
ClearMessage();
//<魅音
DisableWindow();
DrawSceneWithMask( "bg_166", "right", 0, 0, 300 );
DrawSceneWithMask( "bg_165", "right", 0, 0, 300 );
DrawBustshotWithFiltering( 3, "sa_se_de_a1", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );

//「では......うーん@祟殺し編の場合ですと、...叔父を殺そうと決意する辺りですかしら。@
Expand Down Expand Up @@ -1026,7 +1026,7 @@ void main()
ClearMessage();
//<魅音
DisableWindow();
DrawSceneWithMask( "bg_163", "right", 0, 0, 300 );
DrawSceneWithMask( "bg_161", "right", 0, 0, 300 );
DrawBustshot( 2, "re_se_wa_b1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE );
PlayBGM( 1, "msys02", 128, 0 );

Expand Down Expand Up @@ -1151,7 +1151,7 @@ void main()
ClearMessage();
//<鷹野
DisableWindow();
DrawSceneWithMask( "bg_166", "right", 0, 0, 300 );
DrawSceneWithMask( "bg_165", "right", 0, 0, 300 );
DrawBustshotWithFiltering( 1, "si_si_wi_b1", "right", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );

//「鬼ヶ淵の沼に生贄を沈める...生贄の儀式、ですね!@
Expand Down Expand Up @@ -1234,7 +1234,7 @@ void main()
ClearMessage();
//<鷹野
DisableWindow();
DrawSceneWithMask( "bg_163", "left", 0, 0, 300 );
DrawSceneWithMask( "bg_161", "left", 0, 0, 300 );
DrawBustshotWithFiltering( 3, "ir_si_de_a2", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );

//「これで...今度こそ、グッドエンドの大団円シナリオの青写真ができましたね@せっかくだからちょっとやってみましょうか@役者は全員そろってることですしね!¥
Expand Down Expand Up @@ -1321,7 +1321,7 @@ void main()
DisableWindow();
DrawScene( "black", 1000 );
DrawSceneWithMask( "bg_123", "left", 0, 0, 200 );
DrawBustshot( 1, "sa_se_wa_b1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 400, TRUE );
DrawBustshot( 1, "sa_se_ha_b2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 400, TRUE );
//!sd

//「成・敗ッ!!!/
Expand Down Expand Up @@ -1601,7 +1601,7 @@ void main()

//setwindow 31,16,22,16,26,26,0,2,20,1,1,#999999,0,0,639,479
DisableWindow();
DrawScene( "bg_163", 1000 );
DrawScene( "bg_161", 1000 );
DrawBustshotWithFiltering( 3, "re_se_wa_b1", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
PlayBGM( 1, "msys12", 128, 0 );
//!sd
Expand Down Expand Up @@ -1634,7 +1634,7 @@ void main()
SetValidityOfInput( TRUE );
DisableWindow();
DrawBustshot( 2, "re_se_wa_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE );
DrawScene( "bg_163", 400 );
DrawScene( "bg_161", 400 );

//「あれ@ 電話だ@/
PlaySE(4, "s20/02/440200270", 128, 64);
Expand Down
36 changes: 18 additions & 18 deletions Update/tata_001.txt
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@ void main()
NULL, " It did—but I felt like a married life with her would be anything but normal.", Line_Normal);
ClearMessage();
DisableWindow();
DrawScene( "bg_110", 400 );
DrawScene( "bg_108", 400 );

// しかし、みんなすごいよな@
// まだ全然若いのに、しっかり自炊できている@
Expand Down Expand Up @@ -1205,7 +1205,7 @@ void main()

DisableWindow();
DrawScene( "white", 10 );
DrawScene( "bg_110", 10 );
DrawScene( "bg_108", 10 );

//!s0「何とかなるかああぁあぁぁッ!!」!sd/
//!s0
Expand Down Expand Up @@ -1476,7 +1476,7 @@ void main()

DisableWindow();
FadeBustshotWithFiltering( 3, "left", 1, FALSE, 0, 0, 300, TRUE );
DrawBustshotWithFiltering( 3, "sa_se_wa_b1", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );
DrawBustshotWithFiltering( 3, "sa_se_ha_b2", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );

//「そうそう! 人生、何事も経験でございましてよ?@
PlaySE(4, "s19/04/500400129", 128, 64);
Expand Down Expand Up @@ -1642,7 +1642,7 @@ void main()
ClearMessage();
DisableWindow();
DrawBustshot( 3, "ri_se_ni_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 0, FALSE );
DrawSceneWithMask( "bg_110", "right", 0, 0, 300 );
DrawSceneWithMask( "bg_108", "right", 0, 0, 300 );


//「......ボクが見てないと、お鍋とか火元とか不安なのです@たまにガスの元栓も閉め忘れてるのです。@
Expand Down Expand Up @@ -1948,7 +1948,7 @@ void main()


DisableWindow();
DrawBustshot( 2, "sa_se_na_b2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
DrawBustshot( 2, "sa_se_na_b1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );

//「...わぁああぁあぁあああぁんッ!@ 圭々のばかぁー!@ わああぁああぁあん!!@
PlaySE(4, "s19/04/500400159", 128, 64);
Expand Down Expand Up @@ -2283,7 +2283,7 @@ void main()
DisableWindow();
PlayBGM( 1, "msys03", 128, 0 );
DrawBustshot( 3, "re_se_bi_b1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 0, FALSE );
DrawSceneWithMask( "bg_110", "right", 0, 0, 300 );
DrawSceneWithMask( "bg_108", "right", 0, 0, 300 );

//「み、魅ぃちゃん!@ そ、それは......!!!@
PlaySE(4, "s19/02/500200373", 128, 64);
Expand Down Expand Up @@ -2363,7 +2363,7 @@ void main()
NULL, "Rena, and Mion, and Satoko. Everyone nodded deeply in agreement.", Line_Normal);
ClearMessage();
DisableWindow();
DrawSceneWithMask( "bg_110", "left", 0, 0, 300 );
DrawSceneWithMask( "bg_108", "left", 0, 0, 300 );
DrawBustshotWithFiltering( 2, "sa_se_aw_a1", "right", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE );

//「もっとも、圭一さんには、明日のお弁当以前に、今夜のお夕食の方が問題でしょうけどねぇ...@/
Expand All @@ -2372,7 +2372,7 @@ void main()
NULL, "\"Although Keiichi-san's problem might be his own dinner tonight, rather than tomorrow's bento...", Line_WaitForInput);

DisableWindow();
DrawBustshot( 2, "sa_se_wa_b1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
DrawBustshot( 2, "sa_se_ha_b2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );

//をっほっほっほ!@
//「はん@ 俺が今夜、どんな素晴らしいディナーになるか、見ることができなくて残念だな!@ 明日の弁当でその片鱗をほんの少しだけ見せてやるから楽しみにしていろよ!!¥
Expand Down Expand Up @@ -2417,7 +2417,7 @@ void main()
NULL, " Ku-ku-ku-ku!!\"", Line_Normal);
ClearMessage();
DisableWindow();
DrawBustshot( 2, "sa_se_wa_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
DrawBustshot( 2, "sa_se_ha_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );

//「えぇ、楽しみでしてよー!@ 明日、圭一さんはきっと土下座して、それだけはどうかご勘弁を~!@ って泣きながら言うんでしてよ!@ あぁ、目に浮かぶようですわー!!@
//「にゃ、にゃにをーー!!!」/
Expand Down Expand Up @@ -2622,7 +2622,7 @@ void main()
SetValidityOfInput( FALSE );
Wait( 2000 );
SetValidityOfInput( TRUE );
DrawSceneWithMask( "bg_039", "up", 0, 0, 1300 );
DrawSceneWithMask( "bg_040", "up", 0, 0, 1300 );
PlayBGM( 1, "msys05", 128, 0 );

// その日は一日@
Expand Down Expand Up @@ -3676,7 +3676,7 @@ void main()
PlayBGM( 1, "msys03", 128, 0 );
DrawBustshot( 3, "sa_si_bi_b1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 0, FALSE );
DrawBustshot( 1, "ri_si_ko_a1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, FALSE );
DrawSceneWithMask( "bg_116", "left", 0, 0, 300 );
DrawSceneWithMask( "bg_115", "left", 0, 0, 300 );

// 何事かと振り向くと、何とそこには沙都子と梨花ちゃんがいた¥
OutputLine(NULL, " 何事かと振り向くと、何とそこには沙都子と梨花ちゃんがいた。",
Expand Down Expand Up @@ -3732,7 +3732,7 @@ void main()
ClearMessage();
DisableWindow();
DrawScene( "black", 1000 );
DrawSceneWithMask( "bg_170", "up", 0, 0, 300 );
DrawSceneWithMask( "bg_115", "up", 0, 0, 300 );

// 危機一髪のところで大火災を免れ、3人でぜーぜーと肩で息をする...¥
OutputLine(NULL, " 危機一髪のところで大火災を免れ、3人でぜーぜーと肩で息をする…。",
Expand Down Expand Up @@ -3824,7 +3824,7 @@ void main()
ClearMessage();
DisableWindow();
DrawSceneWithMask( "black", "down", 0, 0, 1300 );
DrawSceneWithMask( "bg_116", "up", 0, 0, 300 );
DrawSceneWithMask( "bg_115", "up", 0, 0, 300 );

// 話を聞いてみると...@
// 俺が放火的料理に没頭していたので、沙都子と梨花ちゃんが鳴らしてたチャイムに気付かなかったらしい@
Expand Down Expand Up @@ -4210,7 +4210,7 @@ void main()
ClearMessage();
DisableWindow();
DrawScene( "black", 1000 );
DrawScene( "bg_170", 400 );
DrawScene( "bg_115", 400 );

// ...結局、俺は大口叩いて、晩飯ひとつ満足に作れなかったわけだ@
// このままじゃ今晩はメシ抜き...@
Expand Down Expand Up @@ -4361,7 +4361,7 @@ void main()
ClearMessage();
DisableWindow();
DrawBustshot( 1, "ri_si_ni_a1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, FALSE );
DrawSceneWithMask( "bg_116", "left", 0, 0, 300 );
DrawSceneWithMask( "bg_115", "left", 0, 0, 300 );

//「......圭一は黙って見ているといいのですよ。@
// そう言ってにっこり微笑む@
Expand Down Expand Up @@ -4552,7 +4552,7 @@ void main()
NULL, " There haven't been any sounds of blood spilling, or bursting, or explosions...\"", Line_Normal);
ClearMessage();
DisableWindow();
DrawScene( "bg_116", 400 );
DrawScene( "bg_115", 400 );

// ...少なくともこの時点で、俺よりも料理は達者なことは証明されている@
// 北条沙都子バーサス前原圭一の料理勝負は...早くも勝負アリみたいだ...@
Expand Down Expand Up @@ -5136,7 +5136,7 @@ void main()
NULL, "She spread her arms wide to demonstrate the width of how well they got along.", Line_Normal);
ClearMessage();
DisableWindow();
DrawSceneWithMask( "bg_170", "left", 0, 0, 300 );
DrawSceneWithMask( "bg_115", "left", 0, 0, 300 );

// 梨花ちゃんが言うには@
OutputLine(NULL, " 梨花ちゃんが言うには。",
Expand Down Expand Up @@ -6258,7 +6258,7 @@ void main()
SetValidityOfInput( FALSE );
Wait( 1000 );
SetValidityOfInput( TRUE );
DrawScene( "bg_170", 1000 );
DrawScene( "bg_115", 1000 );
PlayBGM( 1, "msys13", 128, 0 );
DrawBustshotWithFiltering( 3, "ri_si_de_a1", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );

Expand Down
Loading

0 comments on commit 9253c45

Please sign in to comment.