diff --git a/Update/onik_015_03.txt b/Update/onik_015_03.txt
index 155c855..b1d41b1 100644
--- a/Update/onik_015_03.txt
+++ b/Update/onik_015_03.txt
@@ -1361,7 +1361,6 @@ void main()
 //*Sub_Tips_099
 //容疑者のメモ
 
-	SetSpeedOfMessage( TRUE, 100, );
 	DisableWindow();
 	DrawScene( "black", 3000 );
 
@@ -1380,12 +1379,10 @@ void main()
 		   NULL, "July, 1983", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-	SetStyleOfMessageSwinging( 0 );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
+	SetStyleOfMessageSwinging( 0 );
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　某県鹿骨市の寒村、雛見沢で女子生徒殺人事件が起こった。/
@@ -1395,9 +1392,7 @@ void main()
 
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	PlayBGM( 2, "lsys24", 128, 0 );
@@ -1405,13 +1400,10 @@ void main()
 //　容疑者は、前原圭一（１Ｘ歳）/
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　容疑者は、前原圭一（１Ｘ歳）",
-		   NULL, "The suspect is: Keiichi Maebara (Aged 1x )", Line_ContinueAfterTyping);
+		   NULL, "The suspect is: Keiichi Maebara (Aged 1x)", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 	DisableWindow();
 	DrawSceneWithMask( "bg_119", "left", 0, 0, 1300 );
@@ -1424,9 +1416,8 @@ void main()
 
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_WaitForInput);
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //（竜宮礼奈・園崎魅音）を呼び寄せ、金属バットで撲殺。
@@ -1434,9 +1425,7 @@ void main()
 		   NULL, " (Rena Ryuugu, Mion Sonozaki) to his house, and beat them to death with a metal bat.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 	DisableWindow();
 	DrawSceneWithMask( "black", "left", 0, 0, 1300 );
@@ -1452,13 +1441,10 @@ void main()
 	OutputLine(NULL, "　犯行現場は自宅２階の容疑者の自室だった。",
 		   NULL, "The scene of the crime was the suspect's room on the second floor of his house.", Line_ContinueAfterTyping);
 
-
+	FadeOutBGM( 2, 10, TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
-	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　室内は凄まじい返り血に彩られ、被害者ともみ合った形跡が認められた。
@@ -1466,13 +1452,10 @@ void main()
 	OutputLine(NULL, "　室内は凄まじい返り血に彩られ、被害者ともみ合った形跡が認められた。",
 		   NULL, "The inside of the room was covered with a significant quantity of splattered blood, and there were signs of a struggle with the victims.", Line_ContinueAfterTyping);
 
-
+	FadeOutBGM( 2, 10, TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
-	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　また、犯行現場とは別に、玄関、居間、台所でも荒らされた形跡が認められた。
@@ -1482,10 +1465,7 @@ void main()
 
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
-
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 
 //locate 0,2
@@ -1500,12 +1480,10 @@ void main()
 		   NULL, "At the entryway, the shoe rack and wall had evidence of being impacted by a strong blunt force.", Line_ContinueAfterTyping);
 
 
+	FadeOutBGM( 2, 10, TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
-	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　凶器のバットによるものと断定。
@@ -1515,22 +1493,21 @@ void main()
 
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　痕跡に血液反応が出なかったことから、犯行以前に破壊したものと推定。
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　痕跡に血液反応が出なかったことから、犯行以前に破壊したものと推定。",
 		   NULL, " Having no traces of blood, it is believed the destruction occurred before the murders.", Line_ContinueAfterTyping);
 
 
+	FadeOutBGM( 2, 10, TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
-	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　被害者の逃走を阻止するため、容疑者が威圧行為を行なった可能性がある。
@@ -1540,10 +1517,7 @@ void main()
 
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
-
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 
 	DrawSceneWithMask( "bg_170", "right", 0, 0, 1300 );
@@ -1557,13 +1531,10 @@ void main()
 	OutputLine(NULL, "　居間では絨毯が剥がされ、投げ捨てられていた。",
 		   NULL, "In the living room, the rug had been pulled back, then thrown aside.", Line_ContinueAfterTyping);
 
-
+	FadeOutBGM( 2, 10, TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
-	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　これは被害者ともみ合った際のものとは考え難く、その真意は不明。
@@ -1573,10 +1544,7 @@ void main()
 
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
-
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 	DisableWindow();
 	DrawSceneWithMask( "bg_210", "right", 0, 0, 1300 );
@@ -1590,13 +1558,9 @@ void main()
 	OutputLine(NULL, "　台所ではゴミ袋が破かれ、その中身が床にばら撒かれていた。",
 		   NULL, "In the kitchen, the garbage bag was torn apart, and its contents were spread out on the floor.", Line_ContinueAfterTyping);
 
-
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
-
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	PlayBGM( 2, "lsys24", 128, 0 );
 
@@ -1605,13 +1569,10 @@ void main()
 	OutputLine(NULL, "　ゴミは周囲に飛散し、容疑者のものと思われる手形も発見された。",
 		   NULL, "Garbage was strewn about in the surrounding area, and handprints believed to belong to the suspect were discovered.", Line_ContinueAfterTyping);
 
-
+	FadeOutBGM( 2, 10, TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
-	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　容疑者は何らかの理由でゴミを出し、それを掌で叩いたものと考えられる。
@@ -1619,13 +1580,10 @@ void main()
 	OutputLine(NULL, "　容疑者は何らかの理由でゴミを出し、それを掌で叩いたものと考えられる。",
 		   NULL, "It is believed that the suspect had for some reason taken out the garbage and struck it with his fists.", Line_ContinueAfterTyping);
 
-
+	FadeOutBGM( 2, 10, TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
-	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　その真意は不明。
@@ -1635,10 +1593,7 @@ void main()
 
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
-
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 
 //locate 0,4
@@ -1650,13 +1605,10 @@ void main()
 	OutputLine(NULL, "　また、冷蔵庫に貼り付けられていたメモには「針がなかった？」と記されていた。",
 		   NULL, "In addition, there was a note stuck to the fridge. The words \"Was there a needle?\" were written on it.", Line_ContinueAfterTyping);
 
-
+	FadeOutBGM( 2, 10, TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
-	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　意味不明。
@@ -1665,9 +1617,8 @@ void main()
 		   NULL, "The meaning behind this remains unclear.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_WaitForInput);
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　念のためゴミを探すが、針は発見できなかった。
@@ -1675,9 +1626,7 @@ void main()
 		   NULL, " Just in case, the garbage was searched, but a needle was not discovered.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 	DisableWindow();
 	DrawScene( "black", 1000 );
@@ -1691,25 +1640,22 @@ void main()
 	OutputLine(NULL, "　荒らされてはいなかったが、引越し以来、開放したままになっているガレージのシャッターが閉じられていた。",
 		   NULL, "Though the garage door was functional, it had been left open ever since the suspect moved in. The garage door was found closed.", Line_ContinueAfterTyping);
 
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
-
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　シャッターからは容疑者の指紋を検出。
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　シャッターからは容疑者の指紋を検出。",
 		   NULL, "The suspect's fingerprints were discovered on the garage door.", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　その真意は不明。
@@ -1718,9 +1664,7 @@ void main()
 		   NULL, "The reason behind this remains unknown.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 
 	if (AdvMode == 0) { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
@@ -1733,19 +1677,16 @@ void main()
 		   NULL, "The suspect fled the scene of the crime.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_WaitForInput);
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //警邏中の警察官（雛見沢駐在所）が電話ボックス内で倒れているのを発見する。/
 	OutputLine(NULL, "警邏中の警察官（雛見沢駐在所）が電話ボックス内で倒れているのを発見する。",
-		   NULL, " however, a patrolling officer (Hinamizawa Local PD) found the suspect collapsed inside a phone booth.", Line_ContinueAfterTyping);
+		   NULL, " However, a patrolling officer (Hinamizawa Local PD) found the suspect collapsed inside a phone booth.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 3000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 
 //locate 0,5
@@ -1756,12 +1697,11 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　発見時、容疑者は意識不明の重体。",
 		   NULL, "At the time of discovery, the suspect was unconscious in critical condition.", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　直ちに村内の診療所に搬送し手当てをしたが、意識は戻らず２４時間後に死亡した。
@@ -1771,9 +1711,7 @@ void main()
 
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 	DisableWindow();
 	DrawScene( "bg_188", 1000 );
@@ -1786,12 +1724,11 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　検死の結果、直接の死因は出血性ショック死。",
 		   NULL, "The results of the autopsy indicate the immediate cause of death to have been hypovolemic shock.", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　自らの爪で喉を引き裂き、その結果の出血で死に至ったと断定した。
@@ -1801,9 +1738,7 @@ void main()
 
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 
 //locate 0,3
@@ -1814,24 +1749,22 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　先週に発生した富竹氏事件の異常な死に方との酷似に、警察は関連性があるものとして捜査を開始する。",
 		   NULL, "With the similarity to the death of Tomitake-san the prior week, the police believe there to be a connection and have opened an investigation.", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //（ただし、地元からの強い要望により非公開捜査）
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "（ただし、地元からの強い要望により非公開捜査）",
 		   NULL, "(However, due to the wishes of the local authorities, it will be a confidential investigation.)", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　異常な死に方に何らかの薬物の使用を疑うが、富竹氏事件と同様に一切検出されない。
@@ -1840,9 +1773,7 @@ void main()
 		   NULL, "Due to the abnormal nature of the death, it was suspected that drugs were involved. But as with Tomitake-san, no traces were discovered.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 
 //locate 0,5
@@ -1853,12 +1784,11 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　当初はあまりの不可解さに、衝動的な突発的犯行と断定していた。",
 		   NULL, "What prompted all this remains inexplicable. As such, this case is being treated as an act committed on impulse.", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　だが、容疑者の犯行直前までの奇行が次々と露呈するに従い、その方針は変更されることとなる。
@@ -1867,9 +1797,7 @@ void main()
 		   NULL, "However, with several accounts of the suspect's bizarre behavior leading up to the incident, it is possible that this was premeditated.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 
 //locate 0,2
@@ -1880,24 +1808,22 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　親しかったグループとの離縁。孤立。意味不明の言動。",
 		   NULL, "Separated from his group of friends. Isolation. Inexplicable behavior.", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　犯行の数日前からは金属バットを持ち歩くようになっていた。
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　犯行の数日前からは金属バットを持ち歩くようになっていた。",
 		   NULL, "Several days before the incident, the suspect began carrying around a metal bat.", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　攻撃的な言動、独り言は学校でもしばしば見られ、クラスメートが実際にその一部を聞いている。
@@ -1906,9 +1832,7 @@ void main()
 		   NULL, "The suspect was observed displaying aggressive behavior, as well as talking to himself at school. His classmates have actually heard portions of what he was saying.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 
 //locate 0,3
@@ -1919,12 +1843,11 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　犯行の前々日には、両親に自らの死をほのめかす発言もしていた。",
 		   NULL, "Two days before the incident, the suspect declared to his parents the possibility of his death.", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　警察は、これらの状況から、この事件が突発的なものでなく、数日前から予定された計画的犯行の可能性があるとして捜査を開始する。
@@ -1933,9 +1856,7 @@ void main()
 		   NULL, "Due to these circumstances, the police have begun an investigation on the possibility that this crime was not committed on impulse, but was instead planned several days in advance.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 	DisableWindow();
 	DrawScene( "bg_219", 1000 );
@@ -1950,9 +1871,7 @@ void main()
 		   NULL, "Afterwards...", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 1500 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_WaitForInput);
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　容疑者の自室から直筆のメモが発見された。
@@ -1960,12 +1879,10 @@ void main()
 		   NULL, " A note was found in the suspect's room that he had written himself.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-	PlayBGM( 2, "lsys24", 128, 0 );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
+	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　メモはＢ５の大学ノートを半分に裂いたもの２枚で構成され、!s200まるで隠蔽するかのように、!s100壁時計の裏に貼られ、隠されていた。/
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -1973,27 +1890,28 @@ void main()
 		   NULL, "The note was written on two sheets from a B5 college-ruled notebook that had each been torn in half.", Line_ContinueAfterTyping);
 //!s200
 
+	FadeOutBGM( 2, 10, TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
-	Wait( 5 );
-
-	SetSpeedOfMessage( TRUE, 0, );
+	PlayBGM( 2, "lsys24", 128, 0 );
 
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "まるで隠蔽するかのように、",
 		   NULL, "And as if trying to conceal it", Line_ContinueAfterTyping);
 
-	SetSpeedOfMessage( FALSE, 0, );
-
 // !s100
 
+	FadeOutBGM( 2, 10, TRUE );
+	OutputLineAll(NULL, "", Line_WaitForInput);
+
+	PlayBGM( 2, "lsys24", 128, 0 );
+
 	OutputLine(NULL, "壁時計の裏に貼られ、隠されていた。",
 		   NULL, " was stuck hidden behind a clock on the wall.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 	PlayBGM( 2, "lsys24", 128, 0 );
 
@@ -2003,9 +1921,7 @@ void main()
 		   NULL, "The contents are as written in the appendix.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 	DisableWindow();
 	DrawScene( "bg_203", 1000 );
@@ -2019,12 +1935,11 @@ void main()
 		   NULL, "The police believe it to be strongly related to the incident.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-	PlayBGM( 2, "lsys24", 128, 0 );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
+	PlayBGM( 2, "lsys24", 128, 0 );
+
 
 //　容疑者が、何らかの事件に巻き込まれていた可能性があるとして再び捜査方針を転換した。
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2032,12 +1947,11 @@ void main()
 		   NULL, "The police changed their line of investigation based on the possibility that the suspect was involved in some sort of incident himself.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-	PlayBGM( 2, "lsys24", 128, 0 );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
+	PlayBGM( 2, "lsys24", 128, 0 );
+
 
 //　だが、その後なんの手がかりも掴めず、メモそのものの信憑性も疑われるようになる。
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2045,12 +1959,11 @@ void main()
 		   NULL, "However, no further clues were found, casting doubt on the credibility of the note.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-	PlayBGM( 2, "lsys24", 128, 0 );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
+	PlayBGM( 2, "lsys24", 128, 0 );
+
 
 //　この事件は突発的なものなのか、計画的なものなのか。
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2058,9 +1971,8 @@ void main()
 		   NULL, "Was the crime impulsive or premeditated?", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 1000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_WaitForInput);
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　真相もわからず進展もなく、事件は文字通り迷宮入りの様相となった。/
@@ -2068,9 +1980,7 @@ void main()
 		   NULL, " With the situation unclear and no further developments, the case has been labeled as 'Unresolved.'", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 	DisableWindow();
 	PlayBGM( 1, "msys11", 128, 0 );
@@ -2086,9 +1996,7 @@ void main()
 		   NULL, "However... the following year,", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 1000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_WaitForInput);
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　そのメモにひとつの不審が浮上した。/
@@ -2096,10 +2004,7 @@ void main()
 		   NULL, " suspicion arose regarding the nature of the note.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 3000 );
-	SetValidityOfInput( TRUE );
-
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 
 	PlayBGM( 2, "lsys24", 128, 0 );
@@ -2112,35 +2017,29 @@ void main()
 		   NULL, "The note was not written on two halves of B5 paper from two separate sheets...", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_WaitForInput);
+
 	PlayBGM( 2, "lsys24", 128, 0 );
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 
 //　元はＢ５の１ページに書かれたものを…何者かが、
-	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　元はＢ５の１ページに書かれたものを…何者かが、",
 		   NULL, "but was originally a single sheet of B5 paper.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-	PlayBGM( 2, "lsys24", 128, 0 );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
+	PlayBGM( 2, "lsys24", 128, 0 );
+
 
 //　"真ん中の数行を削除するために"/
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　“真ん中の数行を削除するために”",
-		   NULL, "\"In order to erase several lines from the middle,\" someone had...", Line_ContinueAfterTyping);
+		   NULL, "In order to erase several lines from the middle, someone had...", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 1500 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_WaitForInput);
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //破り捨てたのではないか…というのだ。/
@@ -2148,9 +2047,7 @@ void main()
 		   NULL, " torn them out.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 	PlayBGM( 2, "lsys24", 128, 0 );
 //locate 0,2
@@ -2162,12 +2059,11 @@ void main()
 		   NULL, "Judging from the size of the letters, the missing section is estimated to be 2-3 lines.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-	PlayBGM( 2, "lsys24", 128, 0 );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
+	PlayBGM( 2, "lsys24", 128, 0 );
+
 
 //　削除した人物は容疑者以外である可能性が高い。/
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2175,12 +2071,11 @@ void main()
 		   NULL, "It is highly probable that the person who eliminated the lines in question is not the suspect.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-	PlayBGM( 2, "lsys24", 128, 0 );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
+	PlayBGM( 2, "lsys24", 128, 0 );
+
 
 //　また、時計裏に付着していた大量のセロテープ跡から、/
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2188,19 +2083,16 @@ void main()
 		   NULL, "In addition, judging from traces of large quantities of cellophane tape being stuck to the back of the clock,", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_WaitForInput);
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //"メモ以外にも何かが貼り付けられていたのではないか"との憶測も出た。
 	OutputLine(NULL, "“メモ以外にも何かが貼り付けられていたのではないか”との憶測も出た。",
-		   NULL, " speculation that \"something other than the note was stuck there,\" has arisen.", Line_ContinueAfterTyping);
+		   NULL, " speculation that something other than the note was stuck there, has arisen.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 
 //locate 0,4
@@ -2213,12 +2105,11 @@ void main()
 		   NULL, "The person who first discovered the crime was a detective rumored to have a connection with the incident: Kuraudo Ooishi.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-	PlayBGM( 2, "lsys24", 128, 0 );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
+	PlayBGM( 2, "lsys24", 128, 0 );
+
 
 //　任意で事情聴取をしたが、メモの破損については否定する………。/
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2226,9 +2117,7 @@ void main()
 		   NULL, "He underwent voluntary questioning, but denies involvement in any damages to the note.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	DisableWindow();
 	DrawScene( "bg_220", 1000 );
 	ClearMessage();
@@ -2247,9 +2136,7 @@ void main()
 		   NULL, "The suspect's note:", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 	PlayBGM( 2, "lsys24", 128, 0 );
 
@@ -2257,12 +2144,11 @@ void main()
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　私、前原圭一は命を狙われています",
 		   NULL, "I, Keiichi Maebara, am in fear for my life.", Line_ContinueAfterTyping);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　なぜ、誰に、命を狙われているのかはわかりません。
@@ -2271,12 +2157,11 @@ void main()
 		   NULL, "I do not know why they are after my life.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-	PlayBGM( 2, "lsys24", 128, 0 );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
+	PlayBGM( 2, "lsys24", 128, 0 );
+
 
 //　ただひとつ判る事は、オヤシロさまの祟りと関係があるということです。
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2284,12 +2169,11 @@ void main()
 		   NULL, "The only thing I do know is that it has to do with Oyashiro-sama's curse.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-	PlayBGM( 2, "lsys24", 128, 0 );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
+	PlayBGM( 2, "lsys24", 128, 0 );
+
 
 //　レナと魅音は犯人の一味。/
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2297,9 +2181,7 @@ void main()
 		   NULL, "Rena and Mion are conspirators of the perpetrators.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 1000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_WaitForInput);
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //他にも大人が４～５人以上。/
@@ -2307,9 +2189,7 @@ void main()
 		   NULL, " There are four or five adults, maybe more.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 1000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_WaitForInput);
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //白いワゴン車を所有。
@@ -2317,22 +2197,19 @@ void main()
 		   NULL, " They have a white van.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-	PlayBGM( 2, "lsys24", 128, 0 );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
+	PlayBGM( 2, "lsys24", 128, 0 );
+
 
 //（ここまでが１枚目。ここから下は真横に破られている。）
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "（ここまでが１枚目。ここから下は真横に破られている。）",
-		   NULL, "(This is all on the first sheet.  The section below this has been ripped out.)", Line_ContinueAfterTyping);
+		   NULL, "(This is all on the first sheet. The section below this has been ripped out.)", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 	DisableWindow();
 	DrawScene( "bg_221", 1000 );
@@ -2347,12 +2224,11 @@ void main()
 		   NULL, "(This is from the second sheet. The section above this has been ripped out.)", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-	PlayBGM( 2, "lsys24", 128, 0 );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
+	PlayBGM( 2, "lsys24", 128, 0 );
+
 
 //　どうしてこんなことになったのか、私にはわかりません。
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2360,12 +2236,11 @@ void main()
 		   NULL, "I have no idea why it has become like this.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-	PlayBGM( 2, "lsys24", 128, 0 );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
+	PlayBGM( 2, "lsys24", 128, 0 );
+
 
 //　これをあなたが読んだなら、その時、私は死んでいるでしょう。/
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2373,19 +2248,16 @@ void main()
 		   NULL, "If you are reading this, then I am probably already dead.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_WaitForInput);
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //　…死体があるか、ないかの違いはあるでしょうが。
 	OutputLine(NULL, "…死体があるか、ないかの違いはあるでしょうが。",
-		   NULL, " ...Though you may or may not find my body.\"", Line_ContinueAfterTyping);
+		   NULL, " ...Though you may or may not find my body.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 
 //locate 0,6
@@ -2398,9 +2270,8 @@ void main()
 		   NULL, "You, who are reading this. Please uncover the truth.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_WaitForInput);
+
 	PlayBGM( 2, "lsys24", 128, 0 );
 
 //それだけが私の望みです。
@@ -2408,9 +2279,7 @@ void main()
 		   NULL, " That is my only desire.", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_WaitForInput);
 
 //locate 15,12
 //	SetDrawingPointOfMessage( 0, 12 );
@@ -2421,11 +2290,11 @@ void main()
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n\n\n\n", Line_ContinueAfterTyping); }
 
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
-	OutputLine(NULL, "<pos=22>前原圭一",
-		   NULL, "<pos=36>Keiichi Maebara", Line_ContinueAfterTyping);
+	OutputLine(NULL, "前原圭一",
+		   NULL, "Keiichi Maebara", Line_ContinueAfterTyping);
 
 	FadeOutBGM( 2, 10, TRUE );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);
 
 	ClearMessage();
 
@@ -2463,7 +2332,6 @@ void main()
 	DisableWindow();
 	DrawBustshot( 5, "black", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 4000, TRUE );
 	SetStyleOfMessageSwinging( 0 );
-	SetSpeedOfMessage( FALSE, 0, );
 
 //mov %Omake,1
 //mov %NEW_bg,1
diff --git a/Update/onik_op.txt b/Update/onik_op.txt
index 81d432e..01739f4 100644
--- a/Update/onik_op.txt
+++ b/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);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
+		   NULL, "If I was going to be ripped apart anyways,", Line_WaitForInput);
 
-	Wait( 2000 );
 //　身を引き裂かされる方がはるかにマシだと思った。!w4000
-	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "身を引き裂かされる方がはるかにマシだと思った。",
-		   NULL, "having my body ripped apart would've been far better.", Line_ContinueAfterTyping);
-
-
-	Wait( 4000 );
+		   NULL, " having my body ripped apart would've been far better.", Line_Normal);
 	ClearMessage();
 
 
@@ -78,9 +71,7 @@ void main()
 //　信じてた。!w2000
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "信じてた。",
-		   NULL, "I trusted her.", Line_ContinueAfterTyping);
-
-	Wait( 2000 );
+		   NULL, "I trusted her.", Line_ModeSpecific);
 
 	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);
-
-
-	Wait( 2000 );
+		   NULL, "...No, I still trust her.", Line_ModeSpecific);
 
 	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);
-
-
-	Wait( 2000 );
+		   NULL, "Even in this very moment, I trust her.", Line_Normal);
 	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);
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
+		   NULL, "It was as if I was trying to convince myself,", Line_WaitForInput);
 
 
 //　そんな涙声が...もうたまらなく馬鹿馬鹿しくて......。
-	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);
-
-
-	Wait( 4000 );
-
-
+		   NULL, "And those tears... those tears making a mess of my face...", Line_Normal);
 	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);
-
-
-	Wait( 4000 );
-
-
+		   NULL, "That mechanical, repetitious sound finally stilled, and everything fell silent.", Line_Normal);
 	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);
-
-
-	Wait( 2000 );
-
-
+		   NULL, "Only the cry of the cicadas remained, annoyingly loud.", Line_ModeSpecific);
 	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);
-
-
-	Wait( 2000 );
-
-
+		   NULL, "...I felt as if I could still hear her voice.", Line_ModeSpecific);
 	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);
-
-
-	Wait( 4000 );
-
-
+		   NULL, "She is no longer speaking.", Line_Normal);
 	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);
-
-
-	Wait( 2000 );
-
-
+		   NULL, "The only one crying is me.", Line_ModeSpecific);
 	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);
-
-
-	Wait( 4000 );
-
-
+		   NULL, "She never cried.", Line_Normal);
 	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);
-
-
-	Wait( 2000 );
-
-
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
+		   NULL, " then I...", Line_WaitForInput);
 
 
 //　...彼女らのために流す涙はいらないはずなのだ。!w4000
-	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "…彼女らのために流す涙はいらないはずなのだ。",
-		   NULL, "shouldn't need to shed any for her.", Line_ContinueAfterTyping);
-
-
-	Wait( 4000 );
-
-
+		   NULL, " shouldn't need to shed any for her.", Line_Normal);
 	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);
-
-
-	Wait( 2000 );
-
-
+		   NULL, "Then why... this pain, my eyes getting moist... why was this happening?", Line_ModeSpecific);
 	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);
-
-
-	Wait( 4000 );
-
-
+		   NULL, "I still wanted to believe... I hadn't been split apart.", Line_Normal);
 	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);
-
-
-	Wait( 2000 );
-
-
+		   NULL, "That's enough, right?", Line_ModeSpecific);
 	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);
-
-
-	Wait( 4000 );
-
-
+		   NULL, "Inside me, an inner voice whispered gently...", Line_Normal);
 	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);
-
-
-	Wait( 2000 );
-
-
+		   NULL, "My spirit had suffered enough...", Line_ModeSpecific);
 	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);
-
-
-	Wait( 2000 );
-
-
+		   NULL, "...and countless times I'd wavered over whether I should just throw the battered thing away.", Line_ModeSpecific);
 	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);
-
-
-	Wait( 4000 );
-
-
+		   NULL, "Except... I've stubbornly refused to do that, haven't I?", Line_Normal);
 	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);
-
-
-	Wait( 2000 );
-
-
+		   NULL, "I'd feel better if I just threw it away.", Line_ModeSpecific);
 	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);
-
-
-	Wait( 4000 );
-
-
+		   NULL, "Only I can understand that painful struggle, and appreciate it.", Line_Normal);
 	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);
-
-
-	Wait( 2000 );
-
-
+		   NULL, "...I'll acknowledge that much.", Line_ModeSpecific);
 	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);
-
-
-	Wait( 4000 );
-
-
+		   NULL, "...Isn't it all right to just take the easy way out?", Line_Normal);
 	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);
-
-
-	Wait( 2000 );
-
-
+		   NULL, "I'm leaving it behind, with her.", Line_ModeSpecific);
 	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);
-
-
-	Wait( 4000 );
+		   NULL, "...Like flowers by a grave.", Line_Normal);
 	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);
-
-
-	Wait( 2000 );
-
-
+		   NULL, "...Calm your nerves.", Line_ModeSpecific);
 	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);
-
-
-	Wait( 2000 );
-
-
+		   NULL, "...Just lift it up.", Line_ModeSpecific);
 	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);
-
-
-	Wait( 4000 );
-
-
+		   NULL, "And with every swing, forget a little more.", Line_Normal);
 	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);
-
-
-	Wait( 2000 );
-
-
+		   NULL, "That kindness made me happy.", Line_ModeSpecific);
 	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);
-
-
-	Wait( 2000 );
-
-
+		   NULL, "That adorable smile brought me joy.", Line_ModeSpecific);
 	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);
-
-
-	Wait( 2000 );
-
-
+		   NULL, "I liked petting your head.", Line_ModeSpecific);
 	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);
-
-
-	Wait( 2000 );
+		   NULL, "I loved how demure you were.", Line_Normal);
+	ClearMessage();
 
 
 	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);
-
-
-	Wait( 2000 );
-
-
+		   NULL, "...Because this will be the last time.", Line_ModeSpecific);
 	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);
-
-
-	Wait( 2000 );
-
-
+		   NULL, "Because when I swing this down, I'll forget.", Line_ModeSpecific);
 	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);
-
-	Wait( 2000 );
-
-
+		   NULL, "This is... my...", Line_ModeSpecific);
 	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);
-
-
-	Wait( 1000 );
+		   NULL, "First and last...", Line_WaitForInput);
 
 
 	OutputLine(NULL, "花束。",
-		   NULL, " bouquet for you.", Line_ContinueAfterTyping);
-
-
-	Wait( 4000 );
-
-
+		   NULL, " bouquet for you.", Line_Normal);
 	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);
-
-
-	Wait( 2000 );
-
-
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n\n", Line_ContinueAfterTyping); }
-
+		   NULL, "Perhaps... I really did...", Line_WaitForInput);
 
 //　!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, );
 
-
-	Wait( 3000 );
-
-
-	PlaySE( 4, "wa_015", 128, 64 );
-	Wait( 800 );
-
+	OutputLine(NULL, "好きだった。",
+		   NULL, "...love you.", Line_Normal);
 	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 );
diff --git a/Update/onik_tips_15.txt b/Update/onik_tips_15.txt
index 3002a08..e8f5ce4 100644
--- a/Update/onik_tips_15.txt
+++ b/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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 //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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 	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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
 //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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	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 );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
+
 	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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	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 );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 
 	PlayBGM( 2, "lsys24", 128, 0 );
@@ -171,9 +149,7 @@ void main()
 
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	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 );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	ClearMessage();
 
 	PlayBGM( 2, "lsys24", 128, 0 );
@@ -237,10 +205,7 @@ void main()
 
 
 	FadeOutBGM( 2, 10, TRUE );
-	SetValidityOfInput( FALSE );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	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 );
-	Wait( 4000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_Normal);
 	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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
-
+	OutputLineAll(NULL, "", Line_ModeSpecific);
 	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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	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 );
-	Wait( 2000 );
-	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "", Line_ModeSpecific);
+	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 	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 );