Merge pull request #39 from Norgus/master

Fixed a lot of stuff

Update/onik_001.txt

@@ -168,7 +168,7 @@ void main()
 //「早起きしないと朝飯を食いそびれるんだよ。＠
 	PlaySE(3, "s19/01/hr_kei00000", 256, 64);
 	OutputLine(NULL, "「早起きしないと朝飯を食いそびれるんだよ。」",
-		   NULL, "\"If I don't wake up early, I won't have time to eat breakfast.\"", Line_WaitForInput);
+		   NULL, "\"If I don't get up early, I don't make it in time for your early breakfasts!\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
 
 
@@ -988,7 +988,7 @@ void main()
 	
 //そう言って、不敵に笑う魅音の肩を俺はポンと叩く	
 	OutputLine(NULL, "　そう言って、不敵に笑う魅音の肩を俺はポンと叩く",
-		   NULL, "Picking my interest, I placed my hand on her shoulder while she was still smirking.", Line_WaitForInput); 
+		   NULL, "My interest piqued, I placed my hand on her shoulder while she was still smirking.", Line_WaitForInput); 
 	OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping);	
 	
 //「……ちなみにレナのスリーサイズは？」	
@@ -2459,7 +2459,7 @@ void main()
 
 //　今度ぜひ声に出して実況してもらいたいものだ￥
 	OutputLine(NULL, "　今度ぜひ声に出して実況してもらいたいものだ。",
-		   NULL, "I'd like to hear the play-by-play about that next time.", Line_Normal);
+		   NULL, "I'd like to hear the play-by-play of that next time.", Line_Normal);
 	ClearMessage();
 	DisableWindow();
 	FadeAllBustshots( 200, TRUE );
@@ -4186,6 +4186,7 @@ void main()
 	ClearMessage();
 
 //「レナもシカトすんなー！２人がホテル街へ消えたって回覧す＠
+//「レナもシカトすんなー！２人がラブラブだって回覧す < PS3 voice actually says this＠
 	PlaySE(3, "s19/03/990300072", 256, 64);
 	OutputLine(NULL, "「レナもシカトすんなー！２人がホテル街へ消えたって回覧す、",
 		   NULL, "\"Don't you ignore me too, Rena! I'll tell everyone that you two disappeared into the hotel district together!\"", Line_WaitForInput);

Update/onik_002.txt

@@ -657,7 +657,7 @@ void main()
 		   NULL, "\"We're parading around like this, after all.", Line_WaitForInput);
 	PlaySE(3, "s19/03/990300105", 256, 64);
 	OutputLine(NULL, "みんな思うんじゃない？",
-		   NULL, " Don't you all think so, too?", Line_WaitForInput);
+		   NULL, " It'll give everyone a chance to see for themselves.", Line_WaitForInput);
 	PlaySE(3, "s19/03/990300106", 256, 64);
 	OutputLine(NULL, "　圭ちゃんも雛見沢に馴染んでくれたんだーって！」",
 		   NULL, " That Kei-chan is fitting right in here in Hinamizawa!\"", Line_Normal);
@@ -782,9 +782,8 @@ void main()
 	OutputLine(NULL, "　そろそろお昼にしないかな？",
 		   NULL, " About time to have lunch, maybe?", Line_ContinueAfterTyping);
 
-	Wait( 300 );
+	Wait( 1200 );
 
-	PlaySE(3, "s19/02/500200521", 256, 64);
 	OutputLine(NULL, "…かな？」",
 		   NULL, " ...Maybe?\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
@@ -1162,9 +1161,8 @@ void main()
 	OutputLine(NULL, "「そんなことは許せませんのー！！！",
 		   NULL, "\"I will not allow that!!!", Line_ContinueAfterTyping);
 
-	Wait( 400 );
+	Wait( 2000 );
 
-	PlaySE(3, "s19/04/500400222", 256, 64);
 	OutputLine(NULL, "梨花ぁ！」",
 		   NULL, " Rikaa!\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
@@ -1437,7 +1435,7 @@ void main()
 //「きっと昔の人は食べるのに忙しくて、味を褒める暇もなかったのですわ！＠
 	PlaySE(3, "s19/04/990400041", 256, 64);
 	OutputLine(NULL, "「きっと昔の人は食べるのに忙しくて、味を褒める暇もなかったのですわ！」",
-		   NULL, "\"It's probably because back then the people were busy even while eating and didn't have the time to compliment the flavor!\"", Line_WaitForInput);
+		   NULL, "\"It's probably because the people back then were so busy eating that they didn't have the time to compliment the flavor!\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
 
 
@@ -2420,7 +2418,7 @@ void main()
 
 
 //「……ほう…ほっひへもひぃひょ……（もう、どっちでもいいよ）＠
-	PlaySE(3, "s19/03/990300129", 256, 64);
+	PlaySE(3, "s19/01/hr_kei01710", 256, 64);
 	OutputLine(NULL, "「……ほう…ほっひへもひぃひょ……（もう、どっちでもいいよ）」",
 		   NULL, "\"...Hai... Hest Honhu hair hehiho... (I... just don't care anymore.)\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping);
@@ -2682,7 +2680,7 @@ void main()
 
 //　不安定な斜面をひょいひょいと降りていく＠…さすがは田舎育ちだ＠
 	OutputLine(NULL, "　不安定な斜面をひょいひょいと降りていく。",
-		   NULL, "She bounded up the unstable slope.", Line_WaitForInput);
+		   NULL, "She descended the unstable slope with ease.", Line_WaitForInput);
 	OutputLine(NULL, "…さすがは田舎育ちだ。",
 		   NULL, " ...I'd expect no less from a born and bred country girl.", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
@@ -2753,7 +2751,7 @@ void main()
 
 //　ぴょんぴょんと文字通り跳ねるかのような足取りで、レナは廃材のゴミ山の向こうに消えていった＠
 	OutputLine(NULL, "　ぴょんぴょんと文字通り跳ねるかのような足取りで、レナは廃材のゴミ山の向こうに消えていった。",
-		   NULL, "Literally bounding up the heap of trash, Rena disappeared over the other side.", Line_WaitForInput);
+		   NULL, "Literally bounding among the heaps of trash, Rena disappeared from sight.", Line_WaitForInput);
 	OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping);
 
 
@@ -2869,7 +2867,7 @@ void main()
 
 //　俺のいぶかしがる様子も気にせず、男は勝手に自己紹介を始めた＠
 	OutputLine(NULL, "　俺のいぶかしがる様子も気にせず、男は勝手に自己紹介を始めた。",
-		   NULL, "Unfazed by my suspicious outlook, he introduced himself without my prompting.", Line_WaitForInput);
+		   NULL, "Unfazed by my suspicious gaze, he introduced himself without my prompting.", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
 
 
@@ -3000,7 +2998,7 @@ void main()
 		   NULL, "\"Dunno.", Line_WaitForInput);
 	PlaySE(3, "s19/01/hr_kei02320", 256, 64);
 	OutputLine(NULL, "昔、殺して埋めたバラバラ死体でも確認してるんじゃないすか？」",
-		   NULL, " Maybe she's checking on that dismembered corpse that was out here long ago.\"", Line_WaitForInput);
+		   NULL, " Maybe she's checking on the dismembered corpse of someone she buried here long ago?\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
 
 
@@ -3143,7 +3141,6 @@ void main()
 		   NULL, " ...Oh, that thing. Those statues they always have out in front of that fried chicken place...", Line_ContinueAfterTyping);
 
 	Wait( 600 );
-	PlaySE(3, "s19/01/hr_kei02370", 256, 64);
 	OutputLine(NULL, "あの等身大人形の？」",
 		   NULL, " That life-sized dummy?\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
@@ -3226,9 +3223,7 @@ void main()
 	PlaySE(3, "s19/02/990200164", 256, 64);
 	OutputLine(NULL, "「圭一くんが手伝ってくれる☆",
 		   NULL, "\"Keiichi-kun is going to help.☆", Line_ContinueAfterTyping);
-
+	Wait( 1500 );
-	Wait( 300 );
-	PlaySE(3, "s19/02/990200165", 256, 64);
 	OutputLine(NULL, "…ケンタくんをお持ち帰りできる……はぅ…。」",
 		   NULL, " ...I can take Colonel Sanders home... hao...\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);

Update/onik_003.txt

@@ -626,7 +626,7 @@ void main()
 
 	PlaySE(3, "s19/02/990200176", 256, 64);
 	OutputLine(NULL, "…油性じゃないよね？",
-		   NULL, " ...It won't be oil-based paint, right?", Line_WaitForInput);
+		   NULL, " ...It won't be a permanent marker, right?", Line_WaitForInput);
 	PlaySE(3, "s19/02/990200177", 256, 64);
 	OutputLine(NULL, "　油性じゃないよね…？」",
 		   NULL, " ...Right...?\"", Line_WaitForInput);
@@ -636,7 +636,7 @@ void main()
 
 //　…油性って……顔面らくがきが油性ってことか…￥
 	OutputLine(NULL, "　…油性って……顔面らくがきが油性ってことか…？",
-		   NULL, "...Oil-based... Facepainting with oil-based paint?", Line_Normal);
+		   NULL, "...Permanent... She wants to draw on our faces with permanent marker?", Line_Normal);
 	ClearMessage();
 
 
@@ -1197,7 +1197,7 @@ void main()
 
 //　レナの言う通り、いくつかのカードの傷はとても特徴的で、暗記は簡単そうだ＠
 	OutputLine(NULL, "　レナの言う通り、いくつかのカードの傷はとても特徴的で、暗記は簡単そうだ。",
-		   NULL, "It's just as Rena said, each card has its own distinct markings that made them stand out. Memorizing them should be pretty simple.", Line_WaitForInput);
+		   NULL, "It's just as Rena said, several of the cards have their own distinct markings making them stand out. Memorizing them should be pretty simple.", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
 
 
@@ -2528,7 +2528,7 @@ void main()
 
 //　それは…マジック！！　しかも……極太の油性ッ！￥
 	OutputLine(NULL, "　それは…マジック！！　しかも……極太の油性ッ！！",
-		   NULL, "That's... a felt tip marker!! And it's... large and oil-based!!!", Line_Normal);
+		   NULL, "That's... a felt-tip marker!! And it's... a giant permanent one!!!", Line_Normal);
 	ClearMessage();
 
 

Update/onik_tips_01.txt

@@ -522,7 +522,7 @@
 //「え、え、永久就職って何だろ？＠　何だろ？！￥
 	PlaySE(3, "s20/02/440200019", 128, 64);		
 	OutputLine(NULL, "「え、え、永久就職って何だろ？！",
-		   NULL, "\"Wh-wh-what do you mean by work forever!?", Line_WaitForInput);
+		   NULL, "\"Wh-wh-what do you mean by mooch off Kei-chan!?", Line_WaitForInput);
 	OutputLine(NULL, "　何だろ？！」",
 		   NULL, " What do you mean!?\"", Line_Normal);
 	ClearMessage();

Update/onik_tips_02.txt

@@ -84,24 +84,23 @@
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
 
 
-
 //「俺から見りゃ、スカートの沙都子の方が涼しそうだよ＠この時期のズボンの股座がどれだけ蒸すか、女のお前にゃわかるまい！￥
 	PlaySE(3, "s20/01/440100016", 128, 64);		
 	OutputLine(NULL, "「俺から見りゃ、スカートの沙都子の方が涼しそうだよ。",
-		   NULL, "\"From how I see things, the skirt you're wearing looks like it would be much cooler.", Line_WaitForInput);
+		   NULL, "\"From how I see things, the skirt you're wearing looks like it would be much cooler.", Line_ContinueAfterTyping);
-	OutputLine(NULL, "この時期のズボンの股座がどれだけ蒸すか、女のお前にゃわかるまい！」",
+	Wait ( 1500 );
-		   NULL, " A girl like you just wouldn't understand.  Wearing jeans during this season and how steamy the crotch gets!\"", Line_Normal);
+	OutputLine(NULL, "この時期のズボンがどれだけ暑いか、女のお前にゃわかるまい！」",
+		   NULL, " A girl like you wouldn't understand just how hot it is wearing jeans in this season!\"", Line_Normal);
 	ClearMessage();
 	DisableWindow();
 	DrawBustshot( 1, "re_se_ha_b1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
 
 //「......む、...蒸すんだ.........、はぅ......。＠
 	PlaySE(3, "s20/02/440200020", 128, 64);		
-	OutputLine(NULL, "「……む、…蒸すんだ………、はぅ……。」",
+	OutputLine(NULL, "「……あ、…暑いって………、はぅ……。」",
-		   NULL, "\"...It... it gets steamy... Hao...\"", Line_WaitForInput);
+		   NULL, "\"...It... it gets hot... Hao...\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping);
 
-
 //　またこの娘は、いかがわしい想像をたくましくさせてるな...￥
 	OutputLine(NULL, "　またこの娘は、いかがわしい想像をたくましくさせてるな…。",
 		   NULL, "This girl has gone imagining something indecent...", Line_Normal);

Update/onik_tips_03.txt

@@ -72,7 +72,8 @@
 //「......お弁当のおかずも普通ですよ＠お金持ちじゃないです。￥
 	PlaySE(3, "s20/05/440500001", 128, 64);		
 	OutputLine(NULL, "「……お弁当のおかずも普通ですよ。",
-		   NULL, "\"...His lunch is made up of normal stuff.", Line_WaitForInput);
+		   NULL, "\"...His lunch is made up of normal stuff.", Line_ContinueAfterTyping);
+	Wait( 1800 );
 	OutputLine(NULL, "お金持ちじゃないです。」",
 		   NULL, " He isn't rich.\"", Line_Normal);
 	ClearMessage();
@@ -114,7 +115,8 @@
 //「圭ちゃん家ってさ、すっごく大きいでしょ＠　だから建築中から雛見沢中で前原屋敷って呼ばれて注目の的だったんだよ。＠
 	PlaySE(3, "s20/03/440300018", 128, 64);	
 	OutputLine(NULL, "「圭ちゃん家ってさ、すっごく大きいでしょ？",
-		   NULL, "\"Kei-chan... your house, you know... It's pretty big, yeah?", Line_WaitForInput);
+		   NULL, "\"Kei-chan... your house, you know... It's pretty big, yeah?", Line_ContinueAfterTyping);
+	Wait( 1800 );
 	OutputLine(NULL, "　だから建築中から雛見沢中で前原屋敷って呼ばれて注目の的だったんだよ。」",
 		   NULL, " So the architecture has people all around Hinamizawa calling it the Maebara Manor, and it sorta stands out.\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
@@ -184,7 +186,8 @@
 //「あー、諸君らの楽しい想像をぶち壊すようで悪いが、うちは金持ちでも貧乏でもないぞ＠極めて平均的な普通の家庭だ。＠
 	PlaySE(3, "s20/01/440100025", 128, 64);	
 	OutputLine(NULL, "「あー、諸君らの楽しい想像をぶち壊すようで悪いが、うちは金持ちでも貧乏でもないぞ。",
-		   NULL, "\"Yeah, sorry for ruining your imagination, but we aren't millionaires or poor.", Line_WaitForInput);
+		   NULL, "\"Yeah, sorry for ruining your imagination, but we aren't millionaires or poor.", Line_ContinueAfterTyping);
+	Wait( 4200 );
 		   OutputLine(NULL, "極めて平均的な普通の家庭だ。」",
 		   NULL, " We're the image of a normal, average household.\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
@@ -197,7 +200,8 @@
 //「あれだけ大きな家は普通とは言わないって＠　しかも玄関は立派で、門は大型車も入れるようになってるし！＠　絶対、普通じゃないって！＠
 	PlaySE(3, "s20/03/440300019", 128, 64);	
 	OutputLine(NULL, "「あれだけ大きな家は普通とは言わないって！",
-		   NULL, "\"You can't call it normal with that huge house!", Line_WaitForInput);
+		   NULL, "\"You can't call it normal with that huge house!", Line_ContinueAfterTyping);
+	Wait( 2800 );
 	OutputLine(NULL, "　しかも玄関は立派で、門は大型車も入れるようになってるし！！",
 		   NULL, " The entranceway is all grand, and the gate is large enough for a large truck to get through!!", Line_WaitForInput);
 	PlaySE(3, "s20/03/440300020", 128, 64);
@@ -265,7 +269,8 @@
 //「ぜひ今度、圭ちゃんの家を探検してみたいよなぁ＠...お金持ちじゃないと主張しながらもあの邸宅！＠　一体何が隠されているのか！！＠
 	PlaySE(3, "s20/03/440300021", 128, 64);	
 	OutputLine(NULL, "「ぜひ今度、圭ちゃんの家を探検してみたいよなぁ。",
-		   NULL, "\"I'd really like a chance to explore Kei-chan's house...", Line_WaitForInput);
+		   NULL, "\"I'd really like a chance to explore Kei-chan's house...", Line_ContinueAfterTyping);
+	Wait( 1600 );
 	OutputLine(NULL, "…お金持ちじゃないと主張しながらもあの邸宅！！",
 		   NULL, " Claiming not to be rich, but having a home like that!!", Line_WaitForInput);
 	PlaySE(3, "s20/03/440300022", 128, 64);