line merging & translation fix

Update/onik_tips_07.txt

@@ -46,12 +46,13 @@
 //「レナー＠　トイレじゃない＠　最近、お通じが来ないって言ってたなぁ。＠
 	PlaySE(3, "s20/03/440300023", 128, 64);	
 	OutputLine(NULL, "「レナー？",
-		   NULL, "\"Rena~?", Line_WaitForInput);
+		   NULL, "\"Rena~?", Line_ContinueAfterTyping);
+	Wait (400)
 	OutputLine(NULL, "　トイレじゃない？",
-		   NULL, " Didn't she go to the bathroom?", Line_WaitForInput);
+		   NULL, " Didn't she go to the washroom?", Line_WaitForInput);
 	PlaySE(3, "s20/03/440300024", 128, 64);		
-	OutputLine(NULL, "　最近、お通じが来ないって言ってたなぁ。」",
+	OutputLine(NULL, "　除きたいなら止めないけど、通報するからねぇ～」",
-		   NULL, " She did say that she's been having bowel troubles lately.\"", Line_WaitForInput);
+		   NULL, " If you're planning to peep, I won't stop you. I'll call the cops, though~!\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping);
 
 
@@ -63,19 +64,20 @@
 //「......沙都子＠レナを知りませんですか？＠
 	PlaySE(3, "s20/05/440500005", 128, 64);			
 	OutputLine(NULL, "「……沙都子。",
-		   NULL, "\"...Satoko,", Line_WaitForInput);
+		   NULL, "\"...Satoko,", Line_ContinueAfterTyping);
+	Wait (1000)
 	OutputLine(NULL, "レナを知りませんですか？」",
 		   NULL, " do you know where Rena went?\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
 
-
 	DisableWindow();
 	DrawBustshotWithFiltering( 2, "sa_se_aw_a1", "left", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE );
 
 //「レナですの＠　さっき廊下ですれ違いましてよ＠レナは日直だから、花壇にお水をやらないといけませんので。＠
 	PlaySE(3, "s20/04/440400011", 128, 64);			
 	OutputLine(NULL, "「レナですの？",
-		   NULL, "\"Rena, you say?", Line_WaitForInput);
+		   NULL, "\"Rena, you say?", Line_ContinueAfterTyping);
+	Wait (1000)
 	OutputLine(NULL, "　さっき廊下ですれ違いましてよ。",
 		   NULL, " I just passed her in the hallway.", Line_WaitForInput);
 	PlaySE(3, "s20/04/440400012", 128, 64);		
@@ -83,7 +85,6 @@
 		   NULL, " Rena has class duties today, so she's off to water the flower bed.\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
 
-
 	DisableWindow();
 	DrawBustshot( 1, "me_se_aw_a1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
 
@@ -154,7 +155,7 @@
 //「まぁ確かに＠レナとしか呼んでませんから間違えるのも無理はないですわね。＠
 	PlaySE(3, "s20/04/440400013", 128, 64);		
 	OutputLine(NULL, "「まぁ確かに。",
-		   NULL, "\"Well...", Line_WaitForInput);
+		   NULL, "\"Well...", Line_ContinueAfterTyping);
 	OutputLine(NULL, "レナとしか呼んでませんから間違えるのも無理はないですわね。」",
 		   NULL, " I can understand you making that mistake since we only call her Rena.\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping);
@@ -209,7 +210,7 @@
 //「礼奈か＠.........ふーん＠それでレイナじゃなくてレナって読むのか＠　面白い読み方だよな。＠
 	PlaySE(3, "s20/01/440100032", 128, 64);	
 	OutputLine(NULL, "「礼奈か。",
-		   NULL, "\"Reina, is it?", Line_WaitForInput);
+		   NULL, "\"Reina, is it?", Line_ContinueAfterTyping);
 	OutputLine(NULL, "………ふーん。",
 		   NULL, " ...Hmm.", Line_WaitForInput);
 	PlaySE(3, "s20/01/440100033", 128, 64);
@@ -234,10 +235,8 @@
 
 //「レナが言ったのですわ＠レナと呼んで欲しいって＠だからレナなのですわ。￥
 	PlaySE(3, "s20/04/440400015", 128, 64);	
-	OutputLine(NULL, "「レナが言ったのですわ。",
+	OutputLine(NULL, "「レナが言ったのですわ。レナと呼んで欲しいって。",
-		   NULL, "\"Rena had told us", Line_WaitForInput);
+		   NULL, "\"Rena had told us that she wanted us to call her 'Rena.'", Line_WaitForInput);
-	OutputLine(NULL, "レナと呼んで欲しいって。",
-		   NULL, " that she wanted us to call her 'Rena.'", Line_WaitForInput);
 	PlaySE(3, "s20/04/440400016", 128, 64);		
 	OutputLine(NULL, "だからレナなのですわ。」",
 		   NULL, " So we call her Rena.\"", Line_Normal);
@@ -400,7 +399,7 @@
 //「わ＠　わ＠　助さん角さん、こらしめてやりなさーい！！＠
 	PlaySE(3, "s20/02/440200038", 128, 64);	
 	OutputLine(NULL, "「わ！",
-		   NULL, "\"Wah!", Line_WaitForInput);
+		   NULL, "\"Wah!", Line_ContinueAfterTyping);
 	OutputLine(NULL, "　わ！",
 		   NULL, " Wah!", Line_WaitForInput);
 	PlaySE(3, "s20/02/440200039", 128, 64);
@@ -514,7 +513,7 @@
 //「ほらほら、圭一くんも魅ぃちゃんも＠先生来るよ！＠
 	PlaySE(3, "s20/02/440200040", 128, 64);	
 	OutputLine(NULL, "「ほらほら、圭一くんも魅ぃちゃんも。",
-		   NULL, "\"Come on, come on Keiichi-kun, Mii-chan.", Line_WaitForInput);
+		   NULL, "\"Come on, come on Keiichi-kun, Mii-chan.", Line_ContinueAfterTyping);
 	OutputLine(NULL, "先生来るよ！」",
 		   NULL, " The teacher's coming!\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);