Skip to content

Commit

Permalink
Merge branch 'mg'
Browse files Browse the repository at this point in the history
  • Loading branch information
enumag committed Jul 2, 2018
2 parents 4df4cfc + e795513 commit 0c0fe3b
Show file tree
Hide file tree
Showing 43 changed files with 231 additions and 206 deletions.
10 changes: 5 additions & 5 deletions Update/_tsum_001.txt
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ void main()
NULL, " B-But, Keiichi-kun, I think you've been losing a lot these days too, haven't you?\"", Line_Normal);
ClearMessage();

PlayBGM( 0, "B11_Rika", 120, 0 );
PlayBGM( 0, "rika", 120, 0 );

PlayVoice(4, "ps3/s09/01/hr_kei22240", 128);
OutputLine(NULL, "「はっはっはっはっは!!",
Expand Down Expand Up @@ -317,7 +317,7 @@ void main()

FadeOutBGM( 1, 0, FALSE );
DrawBustshot( 19, "no_data", 0, 100, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, TRUE );
PlayBGM( 0, "B04_Bukatu", 120, 0 );
PlayBGM( 0, "4", 120, 0 );

PlayVoice(4, "ps3/s09/01/hr_kei22270", 128);
OutputLine(NULL, "「…て、てめらぁ〜!!",
Expand Down Expand Up @@ -1513,7 +1513,7 @@ void main()
NULL, "Mion set her sight squarely on me while I was trying to shoot and run at the same time. Her shot would obviously be more accurate than mine.", Line_Normal);
ClearMessage();

PlayBGM( 1, "yabaisemi", 120, 0 );
PlayBGM( 1, "semi_r", 120, 0 );
DrawFilm( 3, 255, 255, 255, 256, 0, 400, TRUE );

OutputLine(NULL, " 俺の放った水流は魅音が避けずとも当たらない、あさっての方角に弧を描く。",
Expand Down Expand Up @@ -2328,7 +2328,7 @@ void main()
ClearMessage();

DrawFilm( 3, 255, 255, 255, 256, 0, 200, TRUE );
PlayBGM( 1, "yabaisemi", 120, 0 );
PlayBGM( 1, "semi_r", 120, 0 );
FadeFilm( 200, TRUE );

OutputLine(NULL, " その瞬間、俺の脳髄に雷が走り、状況を全て理解させる!!",
Expand Down Expand Up @@ -2740,7 +2740,7 @@ void main()
ClearMessage();

DrawFilm( 3, 255, 255, 255, 256, 0, 1000, TRUE );
PlayBGM( 1, "yabaisemi", 120, 0 );
PlayBGM( 1, "semi_r", 120, 0 );

OutputLine(NULL, " 沙都子のトラップは失敗してはいなかった。",
NULL, "Satoko's trap was successful.", Line_WaitForInput);
Expand Down
2 changes: 1 addition & 1 deletion Update/_tsum_002_2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ void main()
FadeOutBGM( 3, 0, FALSE );
DrawBustshot( 19, "no_data", 0, 100, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, TRUE );
DrawSceneWithMask( "Re_s2_Resut", "maskright", 7, 0, 300 );
PlayBGM( 0, "B03_Dame", 120, 0 );
PlayBGM( 0, "3", 120, 0 );

SetSpeedOfMessage( TRUE, 128 );
PlayVoice(4, "ps3/s09/00/mana17001", 128);
Expand Down
4 changes: 2 additions & 2 deletions Update/_tsum_003_2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ void main()

DrawBustshotWithFiltering( 1, "Ri_KomaruA1$", "maskright", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 8, 0, FALSE );
DrawSceneWithMask( "Re5", "maskright", 1, 0, 300 );
PlayBGM( 0, "B11_Rika", 120, 0 );
PlayBGM( 0, "rika", 120, 0 );

PlayVoice(4, "ps3/s09/05/170500001", 128);
OutputLine(NULL, "「……みー。」",
Expand Down Expand Up @@ -453,7 +453,7 @@ void main()
FadeOutBGM( 2, 0, FALSE );
FadeOutBGM( 3, 0, FALSE );
DrawBustshot( 19, "no_data", 0, 100, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, TRUE );
PlayBGM( 0, "B03_Dame", 120, 0 );
PlayBGM( 0, "3", 120, 0 );
PlaySE( 0, "s_furu", 128, 64 );
SetValidityOfInput( FALSE );
Wait( 200 );
Expand Down
16 changes: 8 additions & 8 deletions Update/_tsum_003_3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ void main()

DrawBustshotWithFiltering( 0, rn_Iri_Majime, "maskup", 7, 0, 0, FALSE, 0, 0, 0, 0, 0, 9, 0, FALSE );
DrawSceneWithMask( "Re6", "maskup", 7, 0, 300 );
PlayBGM( 0, "B04_Bukatu", 120, 0 );
PlayBGM( 0, "4", 120, 0 );

OutputLine(NULL, " 空中を舞うように大回転しながら、スタッと美しく着地を決めて現れたのは……か、監督ッ?!?!",
NULL, "A guy tumbled in and landed on his feet elegantly... it was Coach!!", Line_Normal);
Expand Down Expand Up @@ -161,7 +161,7 @@ void main()

DrawBustshotWithFiltering( 0, "Sa_AkireruA1-", "maskright", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 9, 0, FALSE );
DrawSceneWithMask( "Re1", "maskright", 1, 0, 300 );
PlayBGM( 0, "B03_Dame", 120, 0 );
PlayBGM( 0, "3", 120, 0 );

PlayVoice(4, "ps3/s09/04/170400003", 128);
OutputLine(NULL, "「まぁ、この格好が罰ゲームになった時点で、多少は心の準備がありましたのよ…。」",
Expand Down Expand Up @@ -461,7 +461,7 @@ void main()
FadeOutBGM( 3, 0, FALSE );
DrawBustshot( 19, "no_data", 0, 100, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, TRUE );
DrawSceneWithMask( "Re6", "maskleft", 1, 0, 300 );
PlayBGM( 0, "B11_Rika", 120, 0 );
PlayBGM( 0, "rika", 120, 0 );

PlayVoice(4, "ps3/s09/01/170100091", 128);
OutputLine(NULL, "「ほらほらレナ、いつまでもはぅはぅしてないで席に座れ。",
Expand Down Expand Up @@ -729,7 +729,7 @@ void main()
DrawBustshot( 19, "no_data", 0, 100, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, TRUE );
DrawScene( "white", 10 );
DrawScene( "Re_s1_Resut", 0 );
PlayBGM( 0, "B03_Dame", 120, 0 );
PlayBGM( 0, "3", 120, 0 );
PlaySE( 0, "s_daidageki", 128, 64 );

PlayVoice(4, "ps3/s09/23/172800019", 128);
Expand Down Expand Up @@ -842,7 +842,7 @@ void main()
NULL, " You should appreciate our sacrifice...!!!\"", Line_Normal);
ClearMessage();

PlayBGM( 0, "B04_Bukatu", 120, 0 );
PlayBGM( 0, "4", 120, 0 );

DisableWindow();
DrawBustshotWithFiltering( 0, "Me_AkuwaraiA2$", "maskright", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 9, 300, TRUE );
Expand Down Expand Up @@ -1406,7 +1406,7 @@ void main()
NULL, " nothing is impossible to me...!!\"", Line_Normal);
ClearMessage();

PlayBGM( 1, "yabaisemi", 120, 0 );
PlayBGM( 1, "semi_r", 120, 0 );

OutputLine(NULL, " 監督はどす黒いオーラで恐ろしい威圧感を滲み出させていた…。",
NULL, "I could see a black aura surrounding him, which I found very intimidating...", Line_WaitForInput);
Expand Down Expand Up @@ -1462,7 +1462,7 @@ void main()

SetSpeedOfMessage( FALSE, 0 );

PlayBGM( 0, "B03_Dame", 120, 0 );
PlayBGM( 0, "3", 120, 0 );

OutputLine(NULL, " 心の用意もろくろくできない内に、魅音はあっさりと火蓋を切って落とす。",
NULL, "I wasn't ready emotionally, but Mion started the game without hesitation.", Line_Normal);
Expand Down Expand Up @@ -1587,7 +1587,7 @@ void main()
NULL, "It looked very dynamic!!", Line_Normal);
ClearMessage();

PlayBGM( 1, "yabaisemi", 120, 0 );
PlayBGM( 1, "semi_r", 120, 0 );

PlayVoice(4, "ps3/s09/23/172800024", 128);
OutputLine(NULL, "「……ぐふぅ。",
Expand Down
2 changes: 1 addition & 1 deletion Update/_tsum_003_4.txt
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ void main()
NULL, "I guessed who it might be when I heard the voice, so I was prepared.", Line_Normal);
ClearMessage();

PlayBGM( 0, "Feel", 120, 0 );
PlayBGM( 0, "hgrs03", 120, 0 );
DisableWindow();
ChangeBustshot( 0, "Rina_Def", 200, TRUE );
DisplayWindow();
Expand Down
2 changes: 1 addition & 1 deletion Update/_tsum_004.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1586,7 +1586,7 @@ void main()

FadeOutBGM( 1, 0, FALSE );
DrawBustshot( 19, "no_data", 0, 100, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, TRUE );
PlayBGM( 0, "Feel", 120, 0 );
PlayBGM( 0, "hgrs03", 120, 0 );

PlayVoice(4, "ps3/s09/02/170200198", 128);
OutputLine(NULL, "「…はぅ〜☆",
Expand Down
6 changes: 3 additions & 3 deletions Update/_tsum_005.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
void main()
{

PlayBGM( 0, "Cradle_song", 120, 0 );
PlayBGM( 0, "bellflower", 120, 0 );
SetColorOfMessage( TRUE, 0xff, 0xcc, 0xff );

DrawSprite( 1, "Waku_W", NULL, -320, -240, 0, 0, 0, 0, FALSE, FALSE, 0, 0, 35, 1300, FALSE );
Expand Down Expand Up @@ -545,14 +545,14 @@ void main()
NULL, " Huh.........?\"", Line_Normal);
ClearMessage();

PlayBGM( 0, "Feel", 120, 0 );
PlayBGM( 0, "hgrs03", 120, 0 );

PlayVoice(4, "ps3/s09/00/173000010", 128);
OutputLine(NULL, "「お母さんね。",
NULL, "\"I'm thinking", Line_WaitForInput);

PlayVoice(4, "ps3/s09/00/173000011", 128);
OutputLine(NULL, "\nお父さんと別れて、アキヒトおじさんと結婚しようと思うの。」",
OutputLine(NULL, "\n お父さんと別れて、アキヒトおじさんと結婚しようと思うの。」",
NULL, " about divorcing your father and getting married to Akihito-san.\"", Line_Normal);
ClearMessage();

Expand Down
4 changes: 2 additions & 2 deletions Update/_tsum_006.txt
Original file line number Diff line number Diff line change
Expand Up @@ -716,7 +716,7 @@ void main()
NULL, " ...What did I have to be depressed about?", Line_Normal);
ClearMessage();

PlayBGM( 0, "Cradle_song", 120, 0 );
PlayBGM( 0, "bellflower", 120, 0 );

OutputLine(NULL, " ……私が何を嫌ってるか、分かってる。",
NULL, "...Well, it was obvious.", Line_Normal);
Expand Down Expand Up @@ -1474,7 +1474,7 @@ void main()
ClearMessage();

DrawScene( "Si_H2", 400 );
PlayBGM( 0, "Feel", 120, 0 );
PlayBGM( 0, "hgrs03", 120, 0 );

PlayVoice(4, "ps3/s09/02/170200254", 128);
OutputLine(NULL, "「…うわぁ………、",
Expand Down
16 changes: 8 additions & 8 deletions Update/_tsum_007.txt
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ void main()
OutputLine(NULL, " 男と律子も、しばらくかかることが分かっているようで、上機嫌に下品な雑談を始めていた。",
NULL, "The man and Ritsuko, already knowing that, started talking amongst themselves.", Line_Normal);
ClearMessage();
PlayBGM( 0, "Z02_Kyousou", 120, 0 );
PlayBGM( 0, "getting_mad", 120, 0 );

PlayVoice(4, "ps3/s09/21/172000046", 128);
OutputLine(NULL, "「律子、お前の雛見沢の旦那の調子はどうなんね。」",
Expand Down Expand Up @@ -1425,7 +1425,7 @@ void main()
NULL, " They're very, very bad people, so you should never get involved with them.\"", Line_Normal);
ClearMessage();

PlayBGM( 0, "yabaisemi", 120, 0 );
PlayBGM( 0, "semi_r", 120, 0 );

PlayVoice(4, "ps3/s09/02/170200283", 128);
OutputLine(NULL, "「どう性質が悪いんですか?」",
Expand Down Expand Up @@ -1521,7 +1521,7 @@ void main()
FadeBustshotWithFiltering( 2, "mask00" , 0, FALSE, 0, 0, 400, TRUE );
DrawBustshot( 0, "Kasa3", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 9, 400, TRUE );
DisplayWindow();
PlayBGM( 0, "Z01_Iwakan", 120, 0 );
PlayBGM( 0, "iwakannnohatuga", 120, 0 );

PlayVoice(4, "ps3/s09/15/1715000020", 128);
OutputLine(NULL, "「あの二人は性質の悪いゴロツキです。",
Expand Down Expand Up @@ -1647,7 +1647,7 @@ void main()

DrawScene( "black", 400 );
SetColorOfMessage( TRUE, 0xff, 0xbb, 0xff );
PlayBGM( 0, "yorumushi", 120, 0 );
PlayBGM( 0, "yoru", 120, 0 );

OutputLine(NULL, " 自宅へ帰ってくると鍵が掛かっていた。",
NULL, "When I got home, the door was locked.", Line_Normal);
Expand Down Expand Up @@ -1753,7 +1753,7 @@ void main()
FadeOutBGM( 0, 0, FALSE );
FadeOutBGM( 2, 0, FALSE );
DrawBustshot( 19, "no_data", 0, 100, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, TRUE );
PlayBGM( 0, "B08_Izyou", 120, 0 );
PlayBGM( 0, "hig_sample_kyouki", 120, 0 );

OutputLine(NULL, " リナさんは、",
NULL, "Rina-san is", Line_ContinueAfterTyping);
Expand Down Expand Up @@ -1924,7 +1924,7 @@ void main()
NULL, "I removed everything from the cash box to get at the bankbooks. Then, I found something new.", Line_WaitForInput);
OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);

PlayBGM( 1, "yabaisemi", 120, 0 );
PlayBGM( 1, "semi_r", 120, 0 );

OutputLine(NULL, " …金庫の底に、新券の壱万円札の束があったからだ。",
NULL, "...On the bottom of the box, there was a bundle of new 10,000 yen bills.", Line_WaitForInput);
Expand Down Expand Up @@ -2101,7 +2101,7 @@ void main()
ClearMessage();

DrawScene( "black", 400 );
PlayBGM( 1, "yabaisemi", 120, 0 );
PlayBGM( 1, "semi_r", 120, 0 );

OutputLine(NULL, " ……父は、将来への蓄えであるはずの定額預金に手をつけていたのである。",
NULL, "...My father was using money from his time deposits.", Line_WaitForInput);
Expand Down Expand Up @@ -2176,7 +2176,7 @@ void main()

PlaySE( 0, "s_page", 128, 64 );
DrawScene( "aka2", 400 );
PlayBGM( 2, "yabaisemi", 120, 0 );
PlayBGM( 2, "semi_r", 120, 0 );

OutputLine(NULL, " その頃の日付に目を移すと、……無味簡素なはずの日付が再び雄弁に語り出す。",
NULL, "The simple numbers and dates on the bankbook had started talking to me.", Line_WaitForInput);
Expand Down
22 changes: 11 additions & 11 deletions Update/_tsum_008.txt
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ void main()
NULL, " Oh, and that doesn't include our monthly test.\"", Line_Normal);
ClearMessage();

PlayBGM( 0, "Feel", 120, 0 );
PlayBGM( 0, "hgrs03", 120, 0 );

PlayVoice(4, "ps3/s09/02/170200290", 128);
OutputLine(NULL, "「もし本当に火星人が攻めて来て、世界中が滅ぼされて、雛見沢も焼け野原になったら、圭一くんは退屈がまぎれて満足かな。",
Expand Down Expand Up @@ -624,7 +624,7 @@ void main()
FadeOutBGM( 3, 0, FALSE );
DrawBustshot( 19, "no_data", 0, 100, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, TRUE );
DrawScene( "black", 400 );
PlayBGM( 0, "T2", 120, 0 );
PlayBGM( 0, "hgrs01", 120, 0 );

OutputLine(NULL, " そう、それは、",
NULL, "That sort of thing...", Line_WaitForInput);
Expand Down Expand Up @@ -953,7 +953,7 @@ void main()
DisableWindow();
DrawBustshot( 0, "Rina_Def", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 9, 400, TRUE );
DisplayWindow();
PlayBGM( 0, "yabaisemi", 120, 0 );
PlayBGM( 0, "semi_r", 120, 0 );

PlayVoice(4, "ps3/s09/20/172100080", 128);
OutputLine(NULL, "「あらー、お帰り礼奈ちゃん。」",
Expand Down Expand Up @@ -1383,7 +1383,7 @@ void main()
ClearMessage();

DrawSceneWithMask( "black", "maskdown", 1, 0, 300 );
PlayBGM( 0, "yabaisemi", 120, 0 );
PlayBGM( 0, "semi_r", 120, 0 );

OutputLine(NULL, " ………私は、戦わなくていいの?",
NULL, "...Didn't I have to fight against her?", Line_WaitForInput);
Expand Down Expand Up @@ -1546,7 +1546,7 @@ void main()
NULL, "She found the station wagon, looked inside of it through the window, and went all 'ooh' and 'ahh' excitedly.", Line_Normal);
ClearMessage();

PlayBGM( 1, "yabaisemi", 120, 0 );
PlayBGM( 1, "semi_r", 120, 0 );
DrawFilm( 3, 255, 255, 255, 256, 0, 1000, TRUE );

OutputLine(NULL, " 私は、この場所が誰も知ラナイ秘密ノ場所デアルコトヲ思イ出シ、意識ト体ガ剥離シテイクヨウナ、ふわふわトシタ感覚に酔ッテイタ。",
Expand Down Expand Up @@ -1653,7 +1653,7 @@ void main()
OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping);


PlayBGM( 1, "yabaisemi", 120, 0 );
PlayBGM( 1, "semi_r", 120, 0 );

OutputLine(NULL, " ……いつまで酔ってるんだレナ。",
NULL, "...I needed to stop feeling like this. Get up, Rena.", Line_WaitForInput);
Expand Down Expand Up @@ -1746,7 +1746,7 @@ void main()
NULL, "\".........What?\"", Line_Normal);
ClearMessage();

PlayBGM( 0, "B08_Izyou", 120, 0 );
PlayBGM( 0, "higurashi_utu", 120, 0 );

PlayVoice(4, "ps3/s09/02/170200329", 128);
OutputLine(NULL, "「お父さんとどういう付き合い方をしたって構いませんが、",
Expand Down Expand Up @@ -1953,7 +1953,7 @@ void main()
OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping);


PlayBGM( 1, "yabaisemi", 120, 0 );
PlayBGM( 1, "semi_r", 120, 0 );

OutputLine(NULL, " 嘘だ嘘だ嘘だ…、妊娠なんて大嘘だ…!!",
NULL, "It's a lie. It's a lie. It's a lie... It's a big lie...!!", Line_WaitForInput);
Expand Down Expand Up @@ -2042,7 +2042,7 @@ void main()
ClearMessage();

DrawScene( "aka1", 400 );
PlayBGM( 2, "yabaisemi", 120, 0 );
PlayBGM( 2, "semi_r", 120, 0 );

PlayVoice(4, "ps3/s09/20/172100141", 128);
OutputLine(NULL, "「んで?",
Expand Down Expand Up @@ -2156,7 +2156,7 @@ void main()
ClearMessage();

DrawFilm( 2, 0xff, 0xcc, 0xcc, 256, 0, 400, TRUE );
PlayBGM( 0, "B08_Izyou", 120, 0 );
PlayBGM( 0, "hig_sample_kyouki", 120, 0 );

OutputLine(NULL, " あれほどまでに敵対していたのに、レナは自らの首が絞られるまで、これほどの直接的な悪意を気付けなかった。",
NULL, "I was openly hostile, but I didn't realize Rina's evil intentions until she started choking me.", Line_Normal);
Expand All @@ -2174,7 +2174,7 @@ void main()
ClearMessage();
SetSpeedOfMessage( FALSE, 0 );

PlayBGM( 1, "yabaisemi", 120, 0 );
PlayBGM( 1, "semi_r", 120, 0 );
DrawFilm( 2, 0xff, 0x99, 0x99, 256, 0, 0, TRUE );

DisableWindow();
Expand Down
Loading

0 comments on commit 0c0fe3b

Please sign in to comment.