Merge master

Update/onik_001.txt

@@ -1148,7 +1148,7 @@ void main()
 //「……ちなみにレナのスリーサイズは？」
 	PlaySE(3, "s19/03/990300013", 256, 64);
 	OutputLine(NULL, "　ちなみに高いよ～、いくら出す？」",
-		   NULL, " By the way, it's expensive~. How much would you pay?\"", Line_ModeSpecific);
+		   NULL, " By the way, it's expensive~. How much would you pay?\"", Line_Normal);
 	ClearMessage();
 
 //よからぬ交渉に感づいたのか、レナが慌てふためきながらまくし立てた。＠

Update/onik_002.txt

@@ -3344,7 +3344,7 @@ void main()
 	SetValidityOfInput( FALSE );
 	Wait( 5000 );
 	SetValidityOfInput( TRUE );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 

Update/onik_003.txt

@@ -638,7 +638,7 @@ void main()
 
 	PlaySE( 4, "wa_007", 128, 64 );
 	ShakeScreenSx( 1, 2, );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 
@@ -1824,7 +1824,7 @@ void main()
 
 //	PlaySE( 4, "wa_007", 128, 64 );
 //	ShakeScreen( 1, 50, 20, 3, 0, );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 	DisableWindow();
@@ -2308,7 +2308,7 @@ void main()
 	PlaySE( 4, "wa_007", 128, 64 );
 	ShakeScreen( 1, 50, 20, 3, 0, );
 	DrawScene( "bg_108", 200 );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 
@@ -2380,7 +2380,7 @@ void main()
 	PlaySE( 4, "wa_007", 128, 64 );
 	ShakeScreen( 1, 50, 20, 3, 0, );
 	OutputLine(NULL, "逆転勝利だッッ！！！！！！！",
-		   NULL, " comeback victory!!!!!!!", Line_ModeSpecific);
+		   NULL, " comeback victory!!!!!!!", Line_Normal);
 	ClearMessage();
 	DisableWindow();
 	DrawSceneWithMask( "bg_108", "right", 0, 0, 300 );

Update/onik_004.txt

@@ -2228,7 +2228,7 @@ void main()
 
 	PlaySE( 4, "wa_002", 128, 64 );
 	ShakeScreen( 1, 50, 20, 5, 0, );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 
@@ -2451,7 +2451,7 @@ void main()
 
 	PlaySE( 4, "wa_007", 128, 64 );
 	ShakeScreen( 1, 50, 20, 3, 0, );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 	DisableWindow();

Update/onik_005.txt

@@ -613,7 +613,7 @@ void main()
 		   NULL, " The Watanagashi Four-Demon Fire Fight!\"", Line_ContinueAfterTyping);
 	PlaySE( 4, "wa_007", 128, 64 );
 	ShakeScreen( 0, 50, 20, 3, 0, );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 	DisableWindow();
@@ -812,7 +812,7 @@ void main()
 	PlaySE( 5, "s19/02/990200320", 300, 64 );
 	PlaySE( 6, "s19/04/990400121", 300, 64 );
 	PlaySE( 7, "s19/05/990500061", 300, 64 );
-	if (AdvMode) { OutputLine("<color=#f5e6d3>部活メンバー</color>", NULL, "<color=#f5e6d3>Club Member</color>", NULL, Line_ContinueAfterTyping); }
+	if (AdvMode) { OutputLine("<color=#f5e6d3>部活メンバー</color>", NULL, "<color=#f5e6d3>Club Members</color>", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "「な〜〜しッ！！」",
 		   NULL, "\"Naaay!\"", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
@@ -4460,7 +4460,7 @@ void main()
 	DisableWindow();
 	DrawScene( "white", 4000 );
 
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 	DisableWindow();

Update/onik_009.txt

@@ -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();
 

Update/onik_010.txt

@@ -2378,7 +2378,7 @@ void main()
 	SetValidityOfInput( FALSE );
 	Wait( 5000 );
 	SetValidityOfInput( TRUE );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 

Update/onik_011.txt

@@ -5008,7 +5008,7 @@ void main()
 	SetValidityOfInput( FALSE );
 	Wait( 3000 );
 	SetValidityOfInput( TRUE );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 

Update/onik_012.txt

@@ -2163,7 +2163,7 @@ void main()
 	SetValidityOfInput( FALSE );
 	Wait( 2000 );
 	SetValidityOfInput( TRUE );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 
@@ -5102,7 +5102,7 @@ void main()
 	SetValidityOfInput( FALSE );
 	Wait( 4000 );
 	SetValidityOfInput( TRUE );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 	PlaySE( 4, "wa_008", 128, 64 );

Update/onik_014.txt

@@ -472,7 +472,7 @@ void main()
 //!sd
 
 	SetSpeedOfMessage( FALSE, 0, );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 
@@ -662,7 +662,7 @@ void main()
 		   NULL, "Kesplash!!!", Line_ContinueAfterTyping);
 
 	ShakeScreenSx( 1, 3, );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 	DisableWindow();
@@ -3904,7 +3904,7 @@ void main()
 	SetValidityOfInput( FALSE );
 	Wait( 2000 );
 	SetValidityOfInput( TRUE );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 
@@ -4542,7 +4542,7 @@ void main()
 	Wait( 3000 );
 	SetValidityOfInput( TRUE );
 
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 

Update/onik_014_02.txt

@@ -5092,7 +5092,7 @@ void main()
 		   NULL, "\"P... Please go away...", Line_WaitForInput);
 	PlaySE(3, "s01/01/120100567", 256, 64);
 	OutputLine(NULL, "……頼むから……帰ってくれ…！！」",
-		   NULL, " I beg you... please go away...!!\"", Line_WaitForInput);
+		   NULL, " I beg you... please go away...!!\"", Line_Normal);
 
 	ClearMessage();
 

Update/onik_015.txt

@@ -3860,7 +3860,7 @@ void main()
 
 	PlaySE( 4, "wa_003", 128, 64 );
 	ShakeScreenSx( 1, 2, );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 

Update/onik_015_02.txt

@@ -2457,7 +2457,7 @@ void main()
 //!sd
 
 	SetSpeedOfMessage( FALSE, 0, );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 
@@ -3388,7 +3388,7 @@ void main()
 	Wait( 3000 );
 	SetValidityOfInput( TRUE );
 
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 

Update/onik_015_03.txt

@@ -405,7 +405,7 @@ void main()
 	SetValidityOfInput( FALSE );
 	Wait( 3000 );
 	SetValidityOfInput( TRUE );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 	DisableWindow();

Update/onik_tips_07.txt

@@ -491,7 +491,7 @@ void main()
 	Wait( 200 );
 	PlaySE( 4, "wa_005", 128, 64 );
 	ShakeScreen( 0, 50, 20, 2, 0, );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 
@@ -549,7 +549,7 @@ void main()
 	Wait( 200 );
 	PlaySE( 4, "wa_002", 128, 64 );
 	Wait( 200 );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 

Update/onik_tips_20.txt

@@ -877,7 +877,7 @@ void main()
 	Wait( 2000 );
 	SetValidityOfInput( TRUE );
 
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();