Updated some scenes and doubled marks.

This commit is contained in:
Aurian
2018-05-19 21:16:20 +02:00
committed by GitHub
parent 69b51fce5c
commit ae6b08c48f

View File

@@ -2633,7 +2633,7 @@ void main()
ClearMessage(); ClearMessage();
DisableWindow(); DisableWindow();
FadeAllBustshots( 200, TRUE ); FadeAllBustshots( 200, TRUE );
ModDrawCharacterWithFiltering(2, 3, "sprite/normal/me1b_tohoho_a1_", "0", "m1", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE ); ModDrawCharacterWithFiltering(2, 3, "sprite/normal/me1b_tohoho_a1_", "0", "m1", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE );
// 魅音が単語帳をべらべらといじりながら投げやりに聞いてきた@ // 魅音が単語帳をべらべらといじりながら投げやりに聞いてきた@
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2660,7 +2660,7 @@ void main()
DisableWindow(); DisableWindow();
ModDrawCharacter(2, 3, "sprite/normal/me1a_def_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE ); ModDrawCharacter(2, 3, "sprite/normal/me1a_def_a1_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
//「進学できないから勉強するわけ?@ //「進学できないから勉強するわけ?@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
@@ -2709,7 +2709,7 @@ void main()
NULL, "Study = Entrance Exams. Having that basic law of the universe so easily overturned sent me into a state of shock.", Line_Normal); NULL, "Study = Entrance Exams. Having that basic law of the universe so easily overturned sent me into a state of shock.", Line_Normal);
ClearMessage(); ClearMessage();
DisableWindow(); DisableWindow();
ModDrawCharacter(2, 3, "sprite/normal/me1a_huteki_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE ); ModDrawCharacter(2, 3, "sprite/normal/me1a_huteki_a1_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
//「そうかもね@試験で振り落とさなきゃならないほど、人もいないし。@ //「そうかもね@試験で振り落とさなきゃならないほど、人もいないし。@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
@@ -2724,7 +2724,7 @@ void main()
DisableWindow(); DisableWindow();
ModDrawCharacter(2, 3, "sprite/normal/me1b_wink_a1_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE ); ModDrawCharacter(2, 3, "sprite/normal/me1b_wink_a1_", "2", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
//「誰でも進学できるならさ、そんなにガリガリとやることもないんじゃない?@ //「誰でも進学できるならさ、そんなにガリガリとやることもないんじゃない?@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
@@ -2767,8 +2767,6 @@ void main()
NULL, "But since it was Mion, it probably didn't actually have that deep of a meaning.", Line_Normal); NULL, "But since it was Mion, it probably didn't actually have that deep of a meaning.", Line_Normal);
ClearMessage(); ClearMessage();
DisableWindow();
DrawSceneWithMask("background/gk3", "m1", 0, 0, 300 );
PlaySE( 4, "wa_001", 128, 64 ); PlaySE( 4, "wa_001", 128, 64 );
SetValidityOfInput( FALSE ); SetValidityOfInput( FALSE );
@@ -2780,7 +2778,7 @@ void main()
NULL, "In place of a chime, the sound of the principal waving a hand bell drifted through the classroom.", Line_Normal); NULL, "In place of a chime, the sound of the principal waving a hand bell drifted through the classroom.", Line_Normal);
ClearMessage(); ClearMessage();
DisableWindow(); DisableWindow();
ModDrawCharacterWithFiltering(1, 3, "sprite/normal/me1a_warai_a1_", "1", "down", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE ); ModDrawCharacter(1, 3, "sprite/normal/me1a_warai_a1_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 600, TRUE );
//「圭ちゃん、おしまいおしまい@ さぁ楽しいランチタ~イム!@ //「圭ちゃん、おしまいおしまい@ さぁ楽しいランチタ~イム!@
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
@@ -3002,8 +3000,8 @@ void main()
ModPlayVoiceLS(6, 5, "ps3/s19/05/990500011", 300, TRUE); ModPlayVoiceLS(6, 5, "ps3/s19/05/990500011", 300, TRUE);
ModPlayVoiceLS(7, 4, "ps3/s19/04/990400017", 300, TRUE); ModPlayVoiceLS(7, 4, "ps3/s19/04/990400017", 300, TRUE);
ModPlayVoiceLS(8, 1, "ps3/s19/01/hr_kei00790_01", 300, TRUE); ModPlayVoiceLS(8, 1, "ps3/s19/01/hr_kei00790_01", 300, TRUE);
OutputLine(NULL, "「いっただきま〜す!!」", OutputLine(NULL, "「「「いっただきま〜す!!」」」",
NULL, "\"Let's eat!!\"", GetGlobalFlag(GLinemodeSp)); NULL, "\"\"\"Let's eat!!\"\"\"", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
@@ -3277,7 +3275,7 @@ void main()
// (backup) SetValidityOfInput( TRUE ); // (backup) SetValidityOfInput( TRUE );
OutputLine(NULL, "あ、", OutputLine(NULL, "あ、",
NULL, " ah,", Line_Continue); NULL, " ah", Line_Continue);
// (backup) SetValidityOfInput( FALSE ); // (backup) SetValidityOfInput( FALSE );
Wait( 800 ); Wait( 800 );
@@ -3794,6 +3792,7 @@ void main()
ClearMessage(); ClearMessage();
PlaySE( 4, "wa_003", 128, 64 ); PlaySE( 4, "wa_003", 128, 64 );
DrawScene("black", 100 );
//「......今、!w400......一体!w400......何が...... //「......今、!w400......一体!w400......何が......
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
@@ -4001,7 +4000,7 @@ void main()
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
ModPlayVoiceLS(3, 2, "ps3/s19/02/990200061", 256, TRUE); ModPlayVoiceLS(3, 2, "ps3/s19/02/990200061", 256, TRUE);
OutputLine(NULL, "「…え、…あ、…ち、違うの、…そーゆうのじゃなくて…その…!」", OutputLine(NULL, "「…え、…あ、…ち、違うの、…そーゆうのじゃなくて…その…!」",
NULL, "\"...Uh, ...ah, ...N-No, ...I didn't mean it like that... you see...!\"", GetGlobalFlag(GLinemodeSp)); NULL, "\"...Uh ...ah ...N-No ...I didn't mean it like that... you see...!\"", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }