diff --git a/Update/omake_01.txt b/Update/omake_01.txt
index 306bb06..ce3de3f 100644
--- a/Update/omake_01.txt
+++ b/Update/omake_01.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -46,6 +45,7 @@ void main()
 
 //「この度は当サークル、０７ｔｈ　Ｅｘｐａｎｓｉｏｎのノベルゲーム＠ひぐらしのなく頃に～鬼隠し編～をお買い上げ下さいまして、誠にありがとうございました＠　いかがだったでしょうか＠　ちょっぴりでもお楽しみいただけたなら幸いです。￥
 	PlaySE(3, "s20/02/440200103", 256, 64);
+	if (AdvMode) { OutputLine("<color=#ef8e2d>レナ</color>", NULL, "<color=#ef8e2d>Rena</color>", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "「この度は当サークル、０７ｔｈ　Ｅｘｐａｎｓｉｏｎのノベルゲーム、",
 		   NULL, "\"Thank you for buying Higurashi When They Cry ~Onikakushi~,", Line_ContinueAfterTyping);
 	OutputLine(NULL, "ひぐらしのなく頃に〜鬼隠し編〜をお買い上げ下さいまして、誠にありがとうございました！",
diff --git a/Update/onik_000.txt b/Update/onik_000.txt
index 1cf0e92..36e61ed 100644
--- a/Update/onik_000.txt
+++ b/Update/onik_000.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -34,6 +33,7 @@ void main()
 	SetStyleOfMessageSwinging( 1 );
 
 //　...誰かが、ずっと謝っている気がした￥
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　…誰かが、ずっと謝っている気がした。",
 		   NULL, "...Somebody has been apologizing for a while now.", Line_Normal);
 	ClearMessage();
diff --git a/Update/onik_001.txt b/Update/onik_001.txt
index 26b582b..2e7c0d8 100644
--- a/Update/onik_001.txt
+++ b/Update/onik_001.txt
@@ -6,7 +6,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -26,6 +25,7 @@ void main()
 	DrawSceneWithMask( "bg_080", "m1", 0, 0, 3000 );
 
 //　夏を迎えても、朝の空気は切るように冷たい＠
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　夏を迎えても、朝の空気は切るように冷たい。",
 		   NULL, "Even though we were approaching summer, the morning air still had a frigid bite.", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index 740486b..e3e0086 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -31,6 +30,7 @@ void main()
 	DrawSceneWithMask( "bg_038", "m1", 0, 0, 1300 );
 
 //　休日の朝をのんびり過ごしていたら、すっかり遅れてしまった＠
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　休日の朝をのんびり過ごしていたら、すっかり遅れてしまった。",
 		   NULL, "I took it a little too easy on the morning of my day off. I was totally late.", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_003.txt b/Update/onik_003.txt
index 063e5a3..bbe9893 100644
--- a/Update/onik_003.txt
+++ b/Update/onik_003.txt
@@ -6,7 +6,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -28,6 +27,7 @@ void main()
 
 //「ランディーくん人形ー？＠　あ～そりゃあレナのツボだわなぁ！＠
 	PlaySE(3, "s19/03/990300130", 256, 64);
+	if (AdvMode) { OutputLine("<color=#75bfa2>魅音</color>", NULL, "<color=#75bfa2>Mion</color>", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "「ランディーくん人形ー？！",
 		   NULL, "\"A Colonel Randy!?", Line_WaitForInput);
 	PlaySE(3, "s19/03/990300131", 256, 64);
diff --git a/Update/onik_004.txt b/Update/onik_004.txt
index 58972d0..44f4fb2 100644
--- a/Update/onik_004.txt
+++ b/Update/onik_004.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -33,6 +32,7 @@ void main()
 	DrawSceneWithMask( "bg_027", "up", 0, 0, 1300 );
 
 //　この学校は、学校として機能しているのか本当に怪しい￥
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　この学校は、学校として機能しているのか本当に怪しい。",
 		   NULL, "The function of this school as an educational facility is very questionable.", Line_Normal);
 	ClearMessage();
diff --git a/Update/onik_005.txt b/Update/onik_005.txt
index 210b90f..f37fb72 100644
--- a/Update/onik_005.txt
+++ b/Update/onik_005.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -27,6 +26,7 @@ void main()
 
 //「あははは！　どうだった圭ちゃん！＠
 	PlaySE(3, "s19/03/990300259", 256, 64);
+	if (AdvMode) { OutputLine("<color=#75bfa2>魅音</color>", NULL, "<color=#75bfa2>Mion</color>", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "「あははは！　どうだった圭ちゃん！」",
 		   NULL, "\"Ahahaha! How was it, Kei-chan?\"", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_009.txt b/Update/onik_009.txt
index b18968b..6ed7af9 100644
--- a/Update/onik_009.txt
+++ b/Update/onik_009.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -29,6 +28,7 @@ void main()
 
 	PlayBGM( 1, "msys12", 128, 0 );
 //　それから数日がたった￥
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　それから数日がたった。",
 		   NULL, "A few days had passed since the incident.", Line_Normal);
 	ClearMessage();
diff --git a/Update/onik_009_02.txt b/Update/onik_009_02.txt
index 7459924..08a4534 100644
--- a/Update/onik_009_02.txt
+++ b/Update/onik_009_02.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -18,6 +17,7 @@ void main()
 	PlayBGM( 2, "lsys19", 128, 0 );
 
 //　沢の流れをぼんやりと見詰めていた俺は、いつのまにかレナとはぐれていた￥
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　沢の流れをぼんやりと見詰めていた俺は、いつのまにかレナとはぐれていた。",
 		   NULL, "While staring off into the stream, I somehow got separated from Rena.", Line_Normal);
 	ClearMessage();
diff --git a/Update/onik_010.txt b/Update/onik_010.txt
index 949f618..3f32a13 100644
--- a/Update/onik_010.txt
+++ b/Update/onik_010.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -40,6 +39,7 @@ void main()
 //!sd
 //「おっはよ～＠　圭ちゃん、昨日はお疲れ様～！＠
 	PlaySE(3, "s01/03/120300013", 256, 64);
+	if (AdvMode) { OutputLine("<color=#75bfa2>魅音</color>", NULL, "<color=#75bfa2>Mion</color>", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "「おっはよ〜！",
 		   NULL, "\"Good morning~!", Line_WaitForInput);
 	PlaySE(3, "s01/03/120300014", 256, 64);
diff --git a/Update/onik_011.txt b/Update/onik_011.txt
index 9a50be4..6d52849 100644
--- a/Update/onik_011.txt
+++ b/Update/onik_011.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -25,6 +24,7 @@ void main()
 
 	PlayBGM( 1, "msys01", 128, 0 );
 //　眠い＠
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　眠い。",
 		   NULL, "Sleepy.", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_012.txt b/Update/onik_012.txt
index 91f1886..563d93a 100644
--- a/Update/onik_012.txt
+++ b/Update/onik_012.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -23,6 +22,7 @@ void main()
 
 	PlayBGM( 1, "msys06", 128, 0 );
 //　倦怠感と頭痛＠
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　倦怠感と頭痛。",
 		   NULL, "Weariness and a headache.", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_013.txt b/Update/onik_013.txt
index 2ef38ad..d238837 100644
--- a/Update/onik_013.txt
+++ b/Update/onik_013.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -23,6 +22,7 @@ void main()
 
 
 //　…ひた、!w500…ひた、!w500…ひた…＠
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　…ひた、",
 		   NULL, "*Tap*", Line_ContinueAfterTyping);
 
diff --git a/Update/onik_014.txt b/Update/onik_014.txt
index b376506..a5e36a8 100644
--- a/Update/onik_014.txt
+++ b/Update/onik_014.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -25,6 +24,7 @@ void main()
 
 	PlayBGM( 1, "msys06", 128, 0 );
 //　これほどはっきりと意識が戻る目覚め方をしたのは初めてだった￥
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　これほどはっきりと意識が戻る目覚め方をしたのは初めてだった。",
 		   NULL, "This was the first time I'd ever woke with such clarity.", Line_Normal);
 	ClearMessage();
diff --git a/Update/onik_014_02.txt b/Update/onik_014_02.txt
index c8ec89b..126cc13 100644
--- a/Update/onik_014_02.txt
+++ b/Update/onik_014_02.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -22,6 +21,7 @@ void main()
 	PlayBGM( 1, "msys11", 128, 0 );
 
 //　俺と悟史が...何だって＠
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　俺と悟史が…何だって？",
 		   NULL, "Satoshi and I... had what?", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_015.txt b/Update/onik_015.txt
index 382e3d9..607c36d 100644
--- a/Update/onik_015.txt
+++ b/Update/onik_015.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -23,6 +22,7 @@ void main()
 	DrawSceneWithMask( "bg_081", "m1", 0, 0, 1300 );
 
 //　一睡もしなかった、というのは嘘になるのだろうか...＠
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　一睡もしなかった、というのは嘘になるのだろうか…。",
 		   NULL, "I guess I'd be lying if I said I didn't get any sleep.", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_015_02.txt b/Update/onik_015_02.txt
index ef22337..ae8838d 100644
--- a/Update/onik_015_02.txt
+++ b/Update/onik_015_02.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -26,6 +25,7 @@ void main()
 	PlayBGM( 1, "msys06", 128, 0 );
 
 //　見慣れた天井だった￥
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　見慣れた天井だった。",
 		   NULL, "A familiar ceiling.", Line_Normal);
 	ClearMessage();
diff --git a/Update/onik_015_03.txt b/Update/onik_015_03.txt
index 1077ff5..305b7ce 100644
--- a/Update/onik_015_03.txt
+++ b/Update/onik_015_03.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -27,6 +26,7 @@ void main()
 	DrawScene( "bg_112", 3000 );
 
 //　喫煙スペースには紫煙が立ち込めていた￥
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　喫煙スペースには紫煙が立ち込めていた。",
 		   NULL, "The smoking room was filled with a cloud of cigarette smoke.", Line_Normal);
 	ClearMessage();
diff --git a/Update/onik_op.txt b/Update/onik_op.txt
index e81849f..990ea9e 100644
--- a/Update/onik_op.txt
+++ b/Update/onik_op.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -55,6 +54,7 @@ void main()
 	if (AdvMode == 0) { SetDrawingPointOfMessage( 0, 5 ); }
 
 //　どうせ引き裂かれるなら、!w2000
+	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); }
diff --git a/Update/onik_tips_01.txt b/Update/onik_tips_01.txt
index a509be5..11b7bb8 100644
--- a/Update/onik_tips_01.txt
+++ b/Update/onik_tips_01.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -31,6 +30,7 @@ void main()
 
 //「......レナってさ、俺と同い年だったよな？＠
 	PlaySE(3, "s20/01/440100001", 128, 64);
+	if (AdvMode) { OutputLine("<color=#a17f7f>圭一</color>", NULL, "<color=#a17f7f>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "「……レナってさ、俺と同い年だったよな？」",
 		   NULL, "\"... So, Rena, we're the same age?\"", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_tips_02.txt b/Update/onik_tips_02.txt
index fea81f6..2b6e7ee 100644
--- a/Update/onik_tips_02.txt
+++ b/Update/onik_tips_02.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -28,6 +27,7 @@ void main()
 	PlayBGM( 2, "lsys12", 128, 0 );
 
 //　まだ６月だってのに...!w1000暑い＠
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　まだ６月だってのに…",
 		   NULL, "It's only June...", Line_ContinueAfterTyping);
 
diff --git a/Update/onik_tips_03.txt b/Update/onik_tips_03.txt
index 80cd813..b29b631 100644
--- a/Update/onik_tips_03.txt
+++ b/Update/onik_tips_03.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -34,6 +33,7 @@ void main()
 
 //「...圭ちゃんってさ、すごいお金持ちってわけでもないの？＠
 	PlaySE(3, "s20/03/440300016", 128, 64);
+	if (AdvMode) { OutputLine("<color=#75bfa2>魅音</color>", NULL, "<color=#75bfa2>Mion</color>", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "「…圭ちゃんってさ、すごいお金持ちってわけでもないの？」",
 		   NULL, "\"...So Kei-chan, you're not stinking rich?\"", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_tips_04.txt b/Update/onik_tips_04.txt
index df0a2c2..b8f17de 100644
--- a/Update/onik_tips_04.txt
+++ b/Update/onik_tips_04.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -26,6 +25,7 @@ void main()
 	PlayBGM( 1, "msys15", 128, 0 );
 
 //　昭和５４年６月ＸＸ日夕刊よ＠
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　昭和５４年６月ＸＸ日夕刊より",
 		   NULL, "From the June XXth 1979 edition.", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_tips_05.txt b/Update/onik_tips_05.txt
index 47db074..50fbf7b 100644
--- a/Update/onik_tips_05.txt
+++ b/Update/onik_tips_05.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -26,6 +25,7 @@ void main()
 
 
 //　昭和五十年十月＠
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　昭和五十年十月。",
 		   NULL, "October, 1975.", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_tips_06.txt b/Update/onik_tips_06.txt
index c570175..2030683 100644
--- a/Update/onik_tips_06.txt
+++ b/Update/onik_tips_06.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -30,6 +29,7 @@ void main()
 	if (AdvMode == 0) { SetDrawingPointOfMessage( 0, 5 ); }
 	SetStyleOfMessageSwinging( 1 );
 //　雛見沢ダムで悪夢の惨劇＠
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　雛見沢ダムで悪夢の惨劇！",
 		   NULL, "Nightmare befalls the Hinamizawa dam!", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_tips_07.txt b/Update/onik_tips_07.txt
index d5e05f6..cf1b8b3 100644
--- a/Update/onik_tips_07.txt
+++ b/Update/onik_tips_07.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -26,6 +25,7 @@ void main()
 
 //「......レナがいないです＠圭一は知りませんですか？＠
 	PlaySE(3, "s20/05/440500004", 128, 64);
+	if (AdvMode) { OutputLine("<color=#6969ab>梨花</color>", NULL, "<color=#6969ab>Rika</color>", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "「……レナがいないです。",
 		   NULL, "\"...Rena's not here.", Line_WaitForInput);
 	OutputLine(NULL, "圭一は知りませんですか？」",
diff --git a/Update/onik_tips_08.txt b/Update/onik_tips_08.txt
index 157a5bc..5048de6 100644
--- a/Update/onik_tips_08.txt
+++ b/Update/onik_tips_08.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -23,7 +22,7 @@ void main()
 	PlayBGM( 1, "msys12", 128, 0 );
 	DrawScene( "bg_077", 1000 );
 
-	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
+	if (AdvMode == 0) { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 //　例年になく早い梅雨明けを迎え、早くも夏の訪れを感じる今日この頃、皆さんにおかれましてはますますご清祥のこととお喜び申し上げます＠
 	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
diff --git a/Update/onik_tips_09.txt b/Update/onik_tips_09.txt
index b17a5c1..a1a60e8 100644
--- a/Update/onik_tips_09.txt
+++ b/Update/onik_tips_09.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -26,6 +25,7 @@ void main()
 	PlayBGM( 1, "msys15", 128, 0 );
 
 //　昭和５５年６月ＸＸ日夕刊よ＠
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　昭和５５年６月ＸＸ日夕刊より",
 		   NULL, "From the June 1980 edition.", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_tips_10.txt b/Update/onik_tips_10.txt
index edb13d9..c04e838 100644
--- a/Update/onik_tips_10.txt
+++ b/Update/onik_tips_10.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -25,6 +24,7 @@ void main()
 	PlayBGM( 1, "msys07", 128, 0 );
 
 //　昭和５６年６月ＸＸ日夕刊よ＠
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　昭和５６年６月ＸＸ日夕刊より",
 		   NULL, "From the June 1981 edition", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_tips_11.txt b/Update/onik_tips_11.txt
index 8bf976d..331f393 100644
--- a/Update/onik_tips_11.txt
+++ b/Update/onik_tips_11.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -30,6 +29,7 @@ void main()
 	SetStyleOfMessageSwinging( 1 );
 
 //（新聞には掲載されなかった......￥
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "（新聞には掲載されなかった……）",
 		   NULL, "(It wasn't reported in the newspaper...)", Line_Normal);
 	ClearMessage();
diff --git a/Update/onik_tips_12.txt b/Update/onik_tips_12.txt
index f8fb9fe..3896c3c 100644
--- a/Update/onik_tips_12.txt
+++ b/Update/onik_tips_12.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -27,6 +26,7 @@ void main()
 
 //「興宮ＳＴより、３号どうぞ＠３号どうぞ。＠
 	PlaySE(3, "s20/00/keijic44001", 128, 64);
+	if (AdvMode) { OutputLine("興宮ＰＳ", NULL, "Okinomiya PS", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "「興宮ＳＴより、３号どうぞ。",
 		   NULL, "\"This is Okinomiya Station, calling Unit 3.", Line_WaitForInput);
 	OutputLine(NULL, "３号どうぞ。」",
diff --git a/Update/onik_tips_13.txt b/Update/onik_tips_13.txt
index 866673f..eb394ae 100644
--- a/Update/onik_tips_13.txt
+++ b/Update/onik_tips_13.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -27,6 +26,7 @@ void main()
 
 //「自分で喉を掻き破った出血性ショック死＠
 	PlaySE(3, "s20/00/443200001", 128, 64);
+	if (AdvMode) { OutputLine("鑑識", NULL, "Forensic Investigator", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "「自分で喉を掻き破った出血性ショック死。",
 		   NULL, "\"Hypovolemic shock induced by clawing out their own throat.", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_tips_14.txt b/Update/onik_tips_14.txt
index 394451b..f8f0e81 100644
--- a/Update/onik_tips_14.txt
+++ b/Update/onik_tips_14.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -25,6 +24,7 @@ void main()
 	PlayBGM( 1, "msys13", 128, 0 );
 
 //　富竹ジロウ（仏＠
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　富竹ジロウ（仏）",
 		   NULL, "Jirou Tomitake (Deceased)", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_tips_15.txt b/Update/onik_tips_15.txt
index 5d70046..1b6b865 100644
--- a/Update/onik_tips_15.txt
+++ b/Update/onik_tips_15.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -35,6 +34,7 @@ void main()
 	SetStyleOfMessageSwinging( 2 );
 
 //昭和５７年７月１日
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "昭和５７年７月１日",
 		   NULL, "July 1, 1982", Line_ContinueAfterTyping);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_tips_16.txt b/Update/onik_tips_16.txt
index 86afcea..7638d0b 100644
--- a/Update/onik_tips_16.txt
+++ b/Update/onik_tips_16.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -28,6 +27,7 @@ void main()
 
 //「単刀直入に...自殺させる薬ってないんですか？＠
 	PlaySE(3, "s20/11/440700018", 128, 64);
+	if (AdvMode) { OutputLine("<color=#b1aab6>大石</color>", NULL, "<color=#b1aab6>Ooishi</color>", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "「単刀直入に…自殺させる薬ってないんですか？」",
 		   NULL, "\"Let's cut to the chase... is there a drug that causes someone to kill themselves?\"", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_tips_17.txt b/Update/onik_tips_17.txt
index 5733cbe..ff8094f 100644
--- a/Update/onik_tips_17.txt
+++ b/Update/onik_tips_17.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -27,6 +26,7 @@ void main()
 
 //「......おんやぁ＠　今の皆さんは確か...。＠
 	PlaySE(3, "s20/11/440700035", 128, 64);
+	if (AdvMode) { OutputLine("<color=#b1aab6>大石</color>", NULL, "<color=#b1aab6>Ooishi</color>", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "「……おんやぁ？",
 		   NULL, "\"...Herm?", Line_ContinueAfterTyping);
 	OutputLine(NULL, "　今の皆さんは確か…。」",
diff --git a/Update/onik_tips_18.txt b/Update/onik_tips_18.txt
index 286f295..270c916 100644
--- a/Update/onik_tips_18.txt
+++ b/Update/onik_tips_18.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -29,6 +28,7 @@ void main()
 
 //「最近、圭一くんの元気がないね＠機嫌が悪いのかな。＠
 	PlaySE(3, "s20/02/440200042", 256, 64);
+	if (AdvMode) { OutputLine("<color=#ef8e2d>レナ</color>", NULL, "<color=#ef8e2d>Rena</color>", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "「最近、圭一くんの元気がないね。",
 		   NULL, "\"Keiichi-kun's been feeling down lately.", Line_ContinueAfterTyping);
 	Wait (2800);
diff --git a/Update/onik_tips_19.txt b/Update/onik_tips_19.txt
index a5de7e3..ff3ffd4 100644
--- a/Update/onik_tips_19.txt
+++ b/Update/onik_tips_19.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -26,6 +25,7 @@ void main()
 
 //「よく映画などに登場しますが、簡単にいうとどのようなものでしょうか。＠
 	PlaySE(3, "s20/00/repoa44001", 256, 64);
+	if (AdvMode) { OutputLine("リポーター", NULL, "Reporter", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "「よく映画などに登場しますが、簡単にいうとどのようなものでしょうか。」",
 		   NULL, "\"I see it in movies quite often, but what is it, exactly?\"", Line_ModeSpecific);
 	if (AdvMode) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
diff --git a/Update/onik_tips_20.txt b/Update/onik_tips_20.txt
index 1540256..fb830db 100644
--- a/Update/onik_tips_20.txt
+++ b/Update/onik_tips_20.txt
@@ -5,7 +5,6 @@ void main()
 	int Line_ModeSpecific;
 	if (AdvMode) {
 		Line_ModeSpecific = Line_Normal;
-		OutputLineAll(NULL, "", Line_ContinueAfterTyping);
 	} else {
 		Line_ModeSpecific = Line_WaitForInput;
 	}
@@ -24,6 +23,7 @@ void main()
 	PlayBGM( 1, "msys01", 128, 0 );
 
 //　セブンスマートは市内にある、酒類食料品の安売量販店だ￥
+	if (AdvMode) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　セブンスマートは市内にある、酒類食料品の安売量販店だ。",
 		   NULL, "The Seventh Mart was a bargain supermarket with food and alcohol.", Line_Normal);
 	ClearMessage();