Merge master

This commit is contained in:
Jáchym Toušek
2017-07-05 17:46:58 +02:00
16 changed files with 32 additions and 32 deletions

View File

@@ -265,7 +265,7 @@ void main()
Wait( 2000 );
SetValidityOfInput( TRUE );
OutputLineAll(NULL, "", Line_WaitForInput);
OutputLineAll(NULL, "", Line_Normal);
ClearMessage();
@@ -1812,7 +1812,7 @@ void main()
PlaySE( 4, "wa_006", 128, 64 );
ShakeScreen( 1, 50, 20, 5, 0, );
OutputLineAll(NULL, "", Line_WaitForInput);
OutputLineAll(NULL, "", Line_Normal);
ClearMessage();
@@ -1916,7 +1916,7 @@ void main()
PlaySE( 4, "wa_007", 128, 64 );
ShakeScreen( 0, 50, 20, 5, 0, );
OutputLineAll(NULL, "", Line_WaitForInput);
OutputLineAll(NULL, "", Line_Normal);
ClearMessage();
@@ -3154,7 +3154,7 @@ void main()
NULL, " No shops.", Line_WaitForInput);
PlaySE(3, "s19/01/hr_kei33950", 256, 64);
OutputLine(NULL, "娯楽もないし…何にもないかもしれないけど。」",
NULL, " Or recreational spots... There might not be anything really here, but you know...\"", Line_ModeSpecific);
NULL, " Or recreational spots... There might not be anything really here, but you know...\"", Line_Normal);
ClearMessage();
@@ -3183,7 +3183,7 @@ void main()
NULL, " Satoko, and Rika-chan...", Line_WaitForInput);
OutputLine(NULL, "誰も茶化さない。",
NULL, " none of them butted in.", Line_WaitForInput);
NULL, " none of them butted in.", Line_Normal);
ClearMessage();