Merge remote-tracking branch 'origin/master' into adv-mode

# Conflicts:
#	Update/onik_015_03.txt
#	Update/onik_op.txt
#	Update/onik_tips_15.txt

Update/onik_op.txt

@@ -50,24 +50,17 @@ void main()
 //locate 0,5
 //!s50
 
-	SetSpeedOfMessage( TRUE, 100, );
 	if (AdvMode == 0) { SetDrawingPointOfMessage( 0, 5 ); }
 
 //　どうせ引き裂かれるなら、!w2000
 	ClearMessage();
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "どうせ引き裂かれるなら、",
-		   NULL, "If I was going to be ripped apart anyways,", Line_ContinueAfterTyping);
+		   NULL, "If I was going to be ripped apart anyways,", Line_WaitForInput);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
-	Wait( 2000 );
 //　身を引き裂かされる方がはるかにマシだと思った。!w4000
-	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "身を引き裂かされる方がはるかにマシだと思った。",
-		   NULL, "having my body ripped apart would've been far better.", Line_ContinueAfterTyping);
+		   NULL, " having my body ripped apart would've been far better.", Line_Normal);
-
-
-	Wait( 4000 );
 	ClearMessage();
 
 
@@ -78,9 +71,7 @@ void main()
 //　信じてた。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "信じてた。",
-		   NULL, "I trusted her.", Line_ContinueAfterTyping);
+		   NULL, "I trusted her.", Line_ModeSpecific);
-
-	Wait( 2000 );
 
 	PlaySE( 4, "wa_015", 128, 64 );
 	Wait( 800 );
@@ -91,10 +82,7 @@ void main()
 //　......いや、信じてる。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "…いや、信じてる。",
-		   NULL, "...No, I still trust her.", Line_ContinueAfterTyping);
+		   NULL, "...No, I still trust her.", Line_ModeSpecific);
-
-
-	Wait( 2000 );
 
 	PlaySE( 4, "wa_015", 128, 64 );
 	Wait( 800 );
@@ -105,10 +93,7 @@ void main()
 //　今この瞬間だって、信じてる。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "今この瞬間だって、信じてる。",
-		   NULL, "Even in this very moment, I trust her.", Line_ContinueAfterTyping);
+		   NULL, "Even in this very moment, I trust her.", Line_Normal);
-
-
-	Wait( 2000 );
 	ClearMessage();
 
 	PlaySE( 4, "wa_015", 128, 64 );
@@ -121,17 +106,14 @@ void main()
 //　でも......薄々は気付いてる。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "でも…薄々は気付いてる。",
-		   NULL, "But... I'm starting to realize.", Line_ContinueAfterTyping);
+		   NULL, "But... I'm starting to realize.", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
-	Wait( 2000 );
-
-
 //　信じたいのは、認めたくないだけだからだ。/
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "信じたいのは、認めたくないだけだからだ。",
-		   NULL, "I only wanted to trust her because I refused to accept the truth.", Line_ContinueAfterTyping);
+		   NULL, "I only wanted to trust her because I refused to accept the truth.", Line_ModeSpecific);
 
 	PlaySE( 4, "wa_015", 128, 64 );
 	Wait( 800 );
@@ -142,14 +124,12 @@ void main()
 //　自分に言い聞かせるような、
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "自分に言い聞かせるような、",
-		   NULL, "It was as if I was trying to convince myself,", Line_ContinueAfterTyping);
+		   NULL, "It was as if I was trying to convince myself,", Line_WaitForInput);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
 //　そんな涙声が...もうたまらなく馬鹿馬鹿しくて......。
-	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "そんな涙声が…もうたまらなく馬鹿馬鹿しくて…。",
-		   NULL, "in such a silly... sobbing voice...", Line_ContinueAfterTyping);
+		   NULL, " in such a silly... sobbing voice...", Line_ModeSpecific);
 
 	PlaySE( 4, "wa_015", 128, 64 );
 	Wait( 800 );
@@ -160,12 +140,7 @@ void main()
 //　さらなる涙が...顔をもっとぐしゃぐしゃにする...。!w3000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "さらなる涙が…顔をもっとぐしゃぐしゃにする…。",
-		   NULL, "And those tears... those tears making a mess of my face...", Line_ContinueAfterTyping);
+		   NULL, "And those tears... those tears making a mess of my face...", Line_Normal);
-
-
-	Wait( 4000 );
-
-
 	ClearMessage();
 //locate 0,6
 
@@ -173,12 +148,7 @@ void main()
 //　機械的に繰り返されていたそれはようやく収まり、とても静かになった。!w4000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "機械的に繰り返されていたそれはようやく収まり、とても静かになった。",
-		   NULL, "That mechanical, repetitious sound finally stilled, and everything fell silent.", Line_ContinueAfterTyping);
+		   NULL, "That mechanical, repetitious sound finally stilled, and everything fell silent.", Line_Normal);
-
-
-	Wait( 4000 );
-
-
 	ClearMessage();
 	DisableWindow();
 	DrawSceneWithMask( "bg_204", "c", 0, 0, 1300 );
@@ -188,56 +158,35 @@ void main()
 //　ひぐらしの声だけが...いやに騒がしい。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "ひぐらしの声だけが…いやに騒がしい。",
-		   NULL, "Only the cry of the cicadas remained, annoyingly loud.", Line_ContinueAfterTyping);
+		   NULL, "Only the cry of the cicadas remained, annoyingly loud.", Line_ModeSpecific);
-
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
 //　なのに、!w1500
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "なのに、",
-		   NULL, "And yet...", Line_ContinueAfterTyping);
+		   NULL, "And yet...", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
-	Wait( 1500 );
-
-
 //　...彼女のそれはまだ聞こえる気がする。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "…彼女のそれはまだ聞こえる気がする。",
-		   NULL, "...I felt as if I could still hear her voice.", Line_ContinueAfterTyping);
+		   NULL, "...I felt as if I could still hear her voice.", Line_ModeSpecific);
-
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
 //　...聞こえるはずはない。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "…聞こえるはずはない。",
-		   NULL, "...But that's not possible.", Line_ContinueAfterTyping);
+		   NULL, "...But that's not possible.", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
-	Wait( 2000 );
-
-
 //　彼女はもう、言うのをやめているのだから。!w4000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "彼女はもう、言うのをやめているのだから。",
-		   NULL, "She is no longer speaking.", Line_ContinueAfterTyping);
+		   NULL, "She is no longer speaking.", Line_Normal);
-
-
-	Wait( 4000 );
-
-
 	ClearMessage();
 
 //locate 0,5
@@ -246,24 +195,14 @@ void main()
 //　泣いているのは俺だけだった。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "泣いているのは俺だけだった。",
-		   NULL, "The only one crying is me.", Line_ContinueAfterTyping);
+		   NULL, "The only one crying is me.", Line_ModeSpecific);
-
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
 //　彼女は泣きもしなかった。!w4000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "彼女は泣きもしなかった。",
-		   NULL, "She never cried.", Line_ContinueAfterTyping);
+		   NULL, "She never cried.", Line_Normal);
-
-
-	Wait( 4000 );
-
-
 	ClearMessage();
 
 //locate 0,2
@@ -272,65 +211,35 @@ void main()
 //　彼女がそれを繰り返し口にしていた時も、表情どころか感情もなかった。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "彼女がそれを繰り返し口にしていた時も、表情どころか感情もなかった。",
-		   NULL, "Even when she repeated those words over and over, she never expressed any emotion, because there were none to show.", Line_ContinueAfterTyping);
+		   NULL, "Even when she repeated those words over and over, she never expressed any emotion, because there were none to show.", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
-
-	Wait( 2000 );
-
-
 //　彼女に、俺のために流す涙がないのなら、!w1000俺にだって。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "彼女に、俺のために流す涙がないのなら、",
 		   NULL, "If she had no tears to shed for me,", Line_ContinueAfterTyping);
 
-	Wait( 1000 );
-
 	OutputLine(NULL, "俺にだって。",
-		   NULL, " then I...", Line_ContinueAfterTyping);
+		   NULL, " then I...", Line_WaitForInput);
-
-
-	Wait( 2000 );
-
-
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
 //　...彼女らのために流す涙はいらないはずなのだ。!w4000
-	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "…彼女らのために流す涙はいらないはずなのだ。",
-		   NULL, "shouldn't need to shed any for her.", Line_ContinueAfterTyping);
+		   NULL, " shouldn't need to shed any for her.", Line_Normal);
-
-
-	Wait( 4000 );
-
-
 	ClearMessage();
 
-	if (AdvMode == 0) { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
-
 
 //　それなのに......痛み、目を潤ませてしまうのは......どうして？!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "それなのに…痛み、目を潤ませてしまうのは…どうして？",
-		   NULL, "Then why... this pain, my eyes getting moist... why was this happening?", Line_ContinueAfterTyping);
+		   NULL, "Then why... this pain, my eyes getting moist... why was this happening?", Line_ModeSpecific);
-
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
 //　それでも引き裂かれてないと、......信じていたいから。!w4000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "それでも引き裂かれてないと、…信じていたいから。",
-		   NULL, "I still wanted to believe... I hadn't been split apart.", Line_ContinueAfterTyping);
+		   NULL, "I still wanted to believe... I hadn't been split apart.", Line_Normal);
-
-
-	Wait( 4000 );
-
-
 	ClearMessage();
 
 //locate 0,6
@@ -339,24 +248,14 @@ void main()
 //　もう充分だろ？!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "もう充分だろ？",
-		   NULL, "That's enough, right?", Line_ContinueAfterTyping);
+		   NULL, "That's enough, right?", Line_ModeSpecific);
-
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
 //　内なる、もうひとりの自分がやさしく語りかける...。!w4000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "内なる、もうひとりの自分がやさしく語りかける…。",
-		   NULL, "Inside me, an inner voice whispered gently...", Line_ContinueAfterTyping);
+		   NULL, "Inside me, an inner voice whispered gently...", Line_Normal);
-
-
-	Wait( 4000 );
-
-
 	ClearMessage();
 
 //locate 0,4
@@ -365,36 +264,21 @@ void main()
 //　俺はもう充分に心を痛めたさ。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "俺はもう充分に心を痛めたさ。",
-		   NULL, "My spirit had suffered enough...", Line_ContinueAfterTyping);
+		   NULL, "My spirit had suffered enough...", Line_ModeSpecific);
-
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
 //　...そして何度も、その痛む心を捨てるべきかどうか迷ったんだ。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "…そして何度も、その痛む心を捨てるべきかどうか迷ったんだ。",
-		   NULL, "...and countless times I'd wavered over whether I should just throw the battered thing away.", Line_ContinueAfterTyping);
+		   NULL, "...and countless times I'd wavered over whether I should just throw the battered thing away.", Line_ModeSpecific);
-
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
 //　だけど俺は...頑なに、捨てることを拒んだんじゃないか。!w4000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "だけど俺は…頑なに、捨てることを拒んだんじゃないか。",
-		   NULL, "Except... I've stubbornly refused to do that, haven't I?", Line_ContinueAfterTyping);
+		   NULL, "Except... I've stubbornly refused to do that, haven't I?", Line_Normal);
-
-
-	Wait( 4000 );
-
-
 	ClearMessage();
 
 //locate 0,2
@@ -403,34 +287,21 @@ void main()
 //　捨てれば...もっと心が楽になれる...。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "捨てれば…もっと心が楽になれる…。",
-		   NULL, "I'd feel better if I just threw it away.", Line_ContinueAfterTyping);
+		   NULL, "I'd feel better if I just threw it away.", Line_ModeSpecific);
-
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
 //　それを知りながらも、俺は信じることを選んだんじゃないか。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "それを知りながらも、俺は信じることを選んだんじゃないか。",
-		   NULL, "Even knowing that, I chose to believe, didn't I?", Line_ContinueAfterTyping);
+		   NULL, "Even knowing that, I chose to believe, didn't I?", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
-	Wait( 2000 );
-
-
 //　その辛かった苦労は、きっと俺にしかわからないし、俺にしかねぎらえない。!w4000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "その辛かった苦労は、きっと俺にしかわからないし、俺にしかねぎらえない。",
-		   NULL, "Only I can understand that painful struggle, and appreciate it.", Line_ContinueAfterTyping);
+		   NULL, "Only I can understand that painful struggle, and appreciate it.", Line_Normal);
-
-
-	Wait( 4000 );
-
-
 	ClearMessage();
 
 
@@ -440,54 +311,35 @@ void main()
 //　なぁ俺。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "なぁ俺。",
-		   NULL, "Hey, me?", Line_ContinueAfterTyping);
+		   NULL, "Hey, me?", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
-	Wait( 2000 );
-
-
 //　...俺は充分に頑張った。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "…俺は充分に頑張った。",
-		   NULL, "...I've tried more than enough.", Line_ContinueAfterTyping);
+		   NULL, "...I've tried more than enough.", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
-	Wait( 2000 );
-
-
 //　......俺がそれを認めてやる。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "…俺がそれを認めてやる。",
-		   NULL, "...I'll acknowledge that much.", Line_ContinueAfterTyping);
+		   NULL, "...I'll acknowledge that much.", Line_ModeSpecific);
-
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
 //　だから。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "だから。",
-		   NULL, "So...", Line_ContinueAfterTyping);
+		   NULL, "So...", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
-	Wait( 2000 );
-
-
 //　......もう楽になってもいいんじゃないか......？!w4000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "…もう楽になってもいいんじゃないか…？",
-		   NULL, "...Isn't it all right to just take the easy way out?", Line_ContinueAfterTyping);
+		   NULL, "...Isn't it all right to just take the easy way out?", Line_Normal);
-
-
-	Wait( 4000 );
-
-
 	ClearMessage();
 
 //locate 0,6
@@ -497,22 +349,14 @@ void main()
 //　それに.........捨てるんじゃない。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "それに…捨てるんじゃない。",
-		   NULL, "Besides... I'm not throwing it away.", Line_ContinueAfterTyping);
+		   NULL, "Besides... I'm not throwing it away.", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
-	Wait( 2000 );
-
-
 //　彼女と一緒に、置いていくんだ。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "彼女と一緒に、置いていくんだ。",
-		   NULL, "I'm leaving it behind, with her.", Line_ContinueAfterTyping);
+		   NULL, "I'm leaving it behind, with her.", Line_ModeSpecific);
-
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
@@ -522,10 +366,7 @@ void main()
 //　...花を手向けるように。!w4000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "…花を手向けるように。",
-		   NULL, "...Like flowers by a grave.", Line_ContinueAfterTyping);
+		   NULL, "...Like flowers by a grave.", Line_Normal);
-
-
-	Wait( 4000 );
 	ClearMessage();
 
 //locate 0,3
@@ -534,56 +375,35 @@ void main()
 //　さぁ。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "さぁ。",
-		   NULL, "Now then.", Line_ContinueAfterTyping);
+		   NULL, "Now then.", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
-	Wait( 2000 );
-
-
 //　......心を落ち着けて...。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "…心を落ち着けて…。",
-		   NULL, "...Calm your nerves.", Line_ContinueAfterTyping);
+		   NULL, "...Calm your nerves.", Line_ModeSpecific);
-
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
 //　もう右腕が痺れているだろうけど。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "もう右腕が痺れているだろうけど。",
-		   NULL, "Even though you can't feel your right arm.", Line_ContinueAfterTyping);
+		   NULL, "Even though you can't feel your right arm.", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
-	Wait( 2000 );
-
-
 //　......頑張って振り上げよう。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "…頑張って振り上げよう。",
-		   NULL, "...Just lift it up.", Line_ContinueAfterTyping);
+		   NULL, "...Just lift it up.", Line_ModeSpecific);
-
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
 //　ひとつ振る度に忘れるんだ。!w4000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "ひとつ振る度に忘れるんだ。",
-		   NULL, "And with every swing, forget a little more.", Line_ContinueAfterTyping);
+		   NULL, "And with every swing, forget a little more.", Line_Normal);
-
-
-	Wait( 4000 );
-
-
 	ClearMessage();
 
 //locate 0,4
@@ -596,12 +416,7 @@ void main()
 //　親切が、うれしかった。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "親切が、うれしかった。",
-		   NULL, "That kindness made me happy.", Line_ContinueAfterTyping);
+		   NULL, "That kindness made me happy.", Line_ModeSpecific);
-
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
@@ -612,12 +427,7 @@ void main()
 //　愛らしい笑顔がうれしかった。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "愛らしい笑顔がうれしかった。",
-		   NULL, "That adorable smile brought me joy.", Line_ContinueAfterTyping);
+		   NULL, "That adorable smile brought me joy.", Line_ModeSpecific);
-
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
@@ -628,12 +438,7 @@ void main()
 //　頭を撫でるのが、好きだった。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "頭を撫でるのが、好きだった。",
-		   NULL, "I liked petting your head.", Line_ContinueAfterTyping);
+		   NULL, "I liked petting your head.", Line_ModeSpecific);
-
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
@@ -644,10 +449,8 @@ void main()
 //　そんな君がはにかむのが、好きだった。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "そんな君がはにかむのが、好きだった。",
-		   NULL, "I loved how demure you were.", Line_ContinueAfterTyping);
+		   NULL, "I loved how demure you were.", Line_Normal);
-
+	ClearMessage();
-
-	Wait( 2000 );
 
 
 	PlaySE( 4, "wa_015", 128, 64 );
@@ -656,8 +459,6 @@ void main()
 	Wait( 300 );
 	PlaySE( 4, "wa_030", 128, 64 );
 
-	ClearMessage();
-
 
 //locate 0,2
 
@@ -666,54 +467,32 @@ void main()
 //　これで最後だから。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "これで最後だから。",
-		   NULL, "...Because this will be the last time.", Line_ContinueAfterTyping);
+		   NULL, "...Because this will be the last time.", Line_ModeSpecific);
-
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
 //　これを振り下ろせば忘れてしまうのだから。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "これを振り下ろせば忘れてしまうのだから。",
-		   NULL, "Because when I swing this down, I'll forget.", Line_ContinueAfterTyping);
+		   NULL, "Because when I swing this down, I'll forget.", Line_ModeSpecific);
-
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
 //　君に贈る、...............俺からの、!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "君に贈る、…俺からの、",
-		   NULL, "This is... my...", Line_ContinueAfterTyping);
+		   NULL, "This is... my...", Line_ModeSpecific);
-
-	Wait( 2000 );
-
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
 //　最初で最後の!w1000花束。!w4000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "最初で最後の",
-		   NULL, "First and last...", Line_ContinueAfterTyping);
+		   NULL, "First and last...", Line_WaitForInput);
-
-
-	Wait( 1000 );
 
 
 	OutputLine(NULL, "花束。",
-		   NULL, " bouquet for you.", Line_ContinueAfterTyping);
+		   NULL, " bouquet for you.", Line_Normal);
-
-
-	Wait( 4000 );
-
-
 	ClearMessage();
 	DisableWindow();
 	DrawScene( "black", 3000 );
@@ -726,43 +505,27 @@ void main()
 //　ひょっとすると、...俺は君の事が、!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "ひょっとすると、…俺は君の事が、",
-		   NULL, "Perhaps... I really did...", Line_ContinueAfterTyping);
+		   NULL, "Perhaps... I really did...", Line_WaitForInput);
-
-
-	Wait( 2000 );
-
-
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n\n", Line_ContinueAfterTyping); }
-
 
 //　!s150.......................................!s50好きだった。!w3000
 
 	SetSpeedOfMessage( TRUE, 10, );
 
-	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "…………………………………",
 		   NULL, "...", Line_ContinueAfterTyping);
 
-	SetSpeedOfMessage( TRUE, 100, );
-
-	OutputLine(NULL, "好きだった。",
-		   NULL, "...love you.", Line_ContinueAfterTyping);
-
 	SetSpeedOfMessage( FALSE, 0, );
 
-
+	OutputLine(NULL, "好きだった。",
-	Wait( 3000 );
+		   NULL, "...love you.", Line_Normal);
-
-
-	PlaySE( 4, "wa_015", 128, 64 );
-	Wait( 800 );
-
 	ClearMessage();
 	DisableWindow();
 
 //bg $862,0
 //setwindow 31,16,22,16,26,26,0,2,20,1,1,#ffffff,0,0,639,479
 
+	PlaySE( 4, "wa_015", 128, 64 );
+	Wait( 800 );
 	PlaySE( 4, "wa_017", 128, 64 );
 	DrawBG( "aka1", 25, TRUE );
 	DrawBustshot( 5, "logo", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 0, TRUE );

Update/onik_tips_15.txt

@@ -25,8 +25,6 @@ void main()
 
 //!s50
 
-	SetSpeedOfMessage( TRUE, 100, );
-
 //locate 13,0
 
 
@@ -38,12 +36,10 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "昭和５７年７月１日",
 		   NULL, "July 1, 1982", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
-	SetValidityOfInput( TRUE );
 
 //locate 13,1
 	PlayBGM( 2, "lsys24", 128, 0 );
@@ -52,12 +48,10 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "総総管イ１−１２号",
 		   NULL, "To departments 1 through 12,", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
-	SetValidityOfInput( TRUE );
 
 	PlayBGM( 2, "lsys24", 128, 0 );
 
@@ -67,12 +61,10 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "ＸＸ県警察本部",
 		   NULL, "XX Prefectural Police headquarters.", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
-	SetValidityOfInput( TRUE );
 
 	PlayBGM( 2, "lsys24", 128, 0 );
 
@@ -80,12 +72,10 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "本部長　ＸＸＸ",
 		   NULL, "Director-General XXX", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
-	SetValidityOfInput( TRUE );
 
 //locate 10,5
 	PlayBGM( 2, "lsys24", 128, 0 );
@@ -98,10 +88,7 @@ void main()
 		   NULL, "To the chief constable and all facility managers.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
@@ -116,25 +103,21 @@ void main()
 		   NULL, "Regarding cases situated in the Hinamizawa village. (Notice)", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_Normal);
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
 	ClearMessage();
 
 	PlayBGM( 2, "lsys24", 128, 0 );
 	SetStyleOfMessageSwinging( 0 );
-	if (AdvMode == 0) { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 //　鹿骨市雛見沢村の近年の事件は、すでに一部マスコミでも報道されるように、/
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　鹿骨市雛見沢村の近年の事件は、すでに一部マスコミでも報道されるように、",
 		   NULL, "As cases in Shishibone city, Hinamizawa village have been reported by certain sections of mass media,", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
-	SetValidityOfInput( TRUE );
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //世間の好奇の目を引き地域住民の穏便な生活に重大な影響を及ぼしつつある、大変憂慮すべき事態となっている。
@@ -143,10 +126,7 @@ void main()
 		   NULL, "it has drawn global attention, which is causing serious repercussions for the local residents. This has become a very serious situation.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	PlayBGM( 2, "lsys24", 128, 0 );
@@ -157,9 +137,7 @@ void main()
 		   NULL, "To protect the livelihood and prosperity of the residents, the following notice has been issued.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_Normal);
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
 	ClearMessage();
 
 	PlayBGM( 2, "lsys24", 128, 0 );
@@ -171,9 +149,7 @@ void main()
 
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	PlayBGM( 2, "lsys24", 128, 0 );
@@ -182,12 +158,10 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　興宮署昭和５７年第Ｘ号",
 		   NULL, "Okinomiya station 1982 case number X:", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
-	SetValidityOfInput( TRUE );
 
 	PlayBGM( 2, "lsys24", 128, 0 );
 
@@ -197,9 +171,7 @@ void main()
 		   NULL, "Hinamizawa village housewife murder (Dated June XX)", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	PlayBGM( 2, "lsys24", 128, 0 );
@@ -208,12 +180,10 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　興宮署昭和５７年第Ｘ号",
 		   NULL, "Okinomiya station 1982 case number X:", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
-	SetValidityOfInput( TRUE );
 
 	PlayBGM( 2, "lsys24", 128, 0 );
 
@@ -223,9 +193,7 @@ void main()
 		   NULL, "Hinamizawa village student disappearance (Dated June XX)", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_Normal);
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
 	ClearMessage();
 
 	PlayBGM( 2, "lsys24", 128, 0 );
@@ -237,10 +205,7 @@ void main()
 
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	PlayBGM( 2, "lsys24", 128, 0 );
@@ -249,12 +214,10 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　興宮署昭和５４年第Ｘ号",
 		   NULL, "Okinomiya station 1979 case number X:", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
-	SetValidityOfInput( TRUE );
 
 	PlayBGM( 2, "lsys24", 128, 0 );
 
@@ -264,10 +227,7 @@ void main()
 		   NULL, "Hinamizawa village site foreman murder (Dated June XX)", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	PlayBGM( 2, "lsys24", 128, 0 );
@@ -276,12 +236,10 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　白川署昭和５５年第Ｘ号",
 		   NULL, "Shira station 1980 case number X:", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
-	SetValidityOfInput( TRUE );
 
 	PlayBGM( 2, "lsys24", 128, 0 );
 
@@ -291,10 +249,7 @@ void main()
 		   NULL, "Shira natural park falling incident (Dated June XX)", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	PlayBGM( 2, "lsys24", 128, 0 );
@@ -303,12 +258,10 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　興宮署昭和５６年第Ｘ号",
 		   NULL, "Okinomiya station 1981 case number X:", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
-	SetValidityOfInput( TRUE );
 
 	PlayBGM( 2, "lsys24", 128, 0 );
 
@@ -318,9 +271,7 @@ void main()
 		   NULL, "Hinamizawa village Shinto priest's wife's disappearance (Dated June XX)", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_Normal);
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
 	ClearMessage();
 
 	PlayBGM( 2, "lsys24", 128, 0 );
@@ -329,12 +280,10 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "（３）関係各機関への報道自粛要請",
 		   NULL, "3. Requesting self-restraint from each organization concerning the release of sensitive information.", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
-	SetValidityOfInput( TRUE );
 
 	PlayBGM( 2, "lsys24", 128, 0 );
 
@@ -344,10 +293,7 @@ void main()
 		   NULL, "Please see attached reference materials 1, 2, and 3.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	PlayBGM( 2, "lsys24", 128, 0 );
@@ -359,12 +305,10 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "担当　ＸＸ県警察本部",
 		   NULL, "Management: XX Prefecture Police headquarters", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
-	SetValidityOfInput( TRUE );
 
 	PlayBGM( 2, "lsys24", 128, 0 );
 //locate 16,9
@@ -375,12 +319,10 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "内線ＸＸＸＸ",
 		   NULL, "Internal line: XXXX", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
-	Wait( 2000 );
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
-	SetValidityOfInput( TRUE );
 
 	PlayBGM( 2, "lsys24", 128, 0 );
 //locate 14,10
@@ -391,14 +333,13 @@ void main()
 		   NULL, "Police Affairs department XX XX", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
+
 	SetValidityOfInput( FALSE );
 	Wait( 1000 );
 	SetValidityOfInput( TRUE );
-	SetSpeedOfMessage( FALSE, 0, );
-
 	DisableWindow();
 	DrawScene( "black", 1000 );
 	FadeOutBGM( 0, 1000, FALSE );