From d089c12ee1c42ce920a33696ea3d7ee4caf048f7 Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Tue, 17 Nov 2015 17:40:13 +0000
Subject: [PATCH 01/32] flow and consistency improvement

This is closer to the Japanese intent and the original translation did
not make sense with the following line calling this a "wise-crack"
---
 Update/onik_001.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_001.txt b/Update/onik_001.txt
index 02d64bb..df0189d 100644
--- a/Update/onik_001.txt
+++ b/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);
 
 

From 7263dcdaa2c2da629c9470b527a27b7516f03099 Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Tue, 17 Nov 2015 17:55:18 +0000
Subject: [PATCH 02/32] grammar correction

"pick" is the wrong verb, and the usage was a little wrong too.
http://blog.dictionary.com/pique-peak-peek/
---
 Update/onik_001.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_001.txt b/Update/onik_001.txt
index df0189d..165129d 100644
--- a/Update/onik_001.txt
+++ b/Update/onik_001.txt
@@ -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);	
 	
 //「……ちなみにレナのスリーサイズは？」	

From 8c87682e6856aed5e4ad55edfbadfc838c481ac4 Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Tue, 17 Nov 2015 18:11:09 +0000
Subject: [PATCH 03/32] grammar

---
 Update/onik_001.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_001.txt b/Update/onik_001.txt
index 165129d..fb7e771 100644
--- a/Update/onik_001.txt
+++ b/Update/onik_001.txt
@@ -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 );

From 736cb76bb7d929f115b7b95207250dfd84c9483a Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Tue, 17 Nov 2015 18:31:45 +0000
Subject: [PATCH 04/32] note about mismatching audio

only a small change here, just slightly more PG friendly (you two are
all lovey-dovey!)
probably not worth an actual script change
---
 Update/onik_001.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Update/onik_001.txt b/Update/onik_001.txt
index fb7e771..7c4a1a5 100644
--- a/Update/onik_001.txt
+++ b/Update/onik_001.txt
@@ -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);

From eac8d4612c5515000401d04641ccca1d7b256efd Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Tue, 17 Nov 2015 18:48:34 +0000
Subject: [PATCH 05/32] nuance correction

Rena is flustered about Mion suggesting she'll become Keiichi's
housewife, and also kind of feigning ignorance in her really obvious way
---
 Update/onik_tips_01.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_tips_01.txt b/Update/onik_tips_01.txt
index 3b59f0a..5200b4b 100644
--- a/Update/onik_tips_01.txt
+++ b/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();

From 43a498c3668d1abe45c580b69a98aa1383645b03 Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Tue, 17 Nov 2015 20:04:49 +0000
Subject: [PATCH 06/32] Translation error

This line didn't make any sense, it sounded like Mion was asking the
entire town of people a question -WTH?
---
 Update/onik_002.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index 4478556..afe8654 100644
--- a/Update/onik_002.txt
+++ b/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);

From 2141cfe75ed1b13b8aac2d6a9674a2cf289e5f6f Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Tue, 17 Nov 2015 20:17:38 +0000
Subject: [PATCH 07/32] Translation fix

people were'nt busy doing _something while eating_, but busy eating.
---
 Update/onik_002.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index afe8654..3760b0a 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -1437,7 +1437,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);
 
 

From 77ba2e2dd818c8a085d9575e5a2cc5ed06b5fc19 Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Tue, 17 Nov 2015 20:37:45 +0000
Subject: [PATCH 08/32] wrong audio
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commented out for now since I can't find the right sound.
The linked sound is Mion saying "seeya tomorrow! Rena, Kei-chan"
じゃね、レナに圭ちゃん、またあしたねえ
---
 Update/onik_002.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index 3760b0a..617c16d 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -2420,7 +2420,7 @@ void main()
 
 
 //「……ほう…ほっひへもひぃひょ……（もう、どっちでもいいよ）＠
-	PlaySE(3, "s19/03/990300129", 256, 64);
+//	PlaySE(3, "s19/03/990300129", 256, 64);
 	OutputLine(NULL, "「……ほう…ほっひへもひぃひょ……（もう、どっちでもいいよ）」",
 		   NULL, "\"...Hai... Hest Honhu hair hehiho... (I... just don't care anymore.)\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping);

From e815273b70740752288ec1e31aee0eb815f608c5 Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Tue, 17 Nov 2015 20:43:27 +0000
Subject: [PATCH 09/32] discovered correct sound!

got it :D
---
 Update/onik_002.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index 617c16d..86b8b1c 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -2420,7 +2420,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);

From 6e4eafb0a9c7bda5af69fc7e306f6f7985604e04 Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Tue, 17 Nov 2015 20:47:43 +0000
Subject: [PATCH 10/32] Translation fix

opposite meaning
---
 Update/onik_002.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index 86b8b1c..930aca5 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -2682,7 +2682,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);

From a696507fa89f645ccc948bd418613272faabb916 Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Tue, 17 Nov 2015 20:54:38 +0000
Subject: [PATCH 11/32] consistency

originally worded as thought there were one heap of trash Rena was
mounting
---
 Update/onik_002.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index 930aca5..4000a6c 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -2753,7 +2753,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);
 
 

From ff8888eda4df449dd3d48ba93cd9e98c14aac7c6 Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Tue, 17 Nov 2015 20:57:53 +0000
Subject: [PATCH 12/32] misuse of word

I don't think outlook means what somebody thinks it does
---
 Update/onik_002.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index 4000a6c..d5d0ffe 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -2869,7 +2869,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);
 
 

From 98006240c1b45f14a8e35eeee5dc6a1d8917380c Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Tue, 17 Nov 2015 21:05:05 +0000
Subject: [PATCH 13/32] translation fix

Keiichi is joking that Rena's returning to the scene of her crime. it
makes no sense to mention "that dismembered corpse" from his perspective
of sarcastically inventing a crime. (also, the Japanese is very clear..
not sure why this wording was adopted)
---
 Update/onik_002.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index d5d0ffe..4c35dcc 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -3000,7 +3000,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);
 
 

From ca5b05d9c70b5c2fc3bdf86c100c6ea45062f880 Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Tue, 17 Nov 2015 21:34:08 +0000
Subject: [PATCH 14/32] sound clipped

changed so that it's possible to wait for the sound in non-auto mode at
least
---
 Update/onik_002.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index 4c35dcc..854aee7 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -3140,7 +3140,7 @@ void main()
 		   NULL, "\"A Colonel Sanders doll!?", Line_WaitForInput);
 	PlaySE(3, "s19/01/hr_kei02360", 256, 64);
 	OutputLine(NULL, "　…ってあれか、ケンタくんフライドチキンの店の前に必ず置いてある…",
-		   NULL, " ...Oh, that thing. Those statues they always have out in front of that fried chicken place...", Line_ContinueAfterTyping);
+		   NULL, " ...Oh, that thing. Those statues they always have out in front of that fried chicken place...", Line_WaitForInput);
 
 	Wait( 600 );
 	PlaySE(3, "s19/01/hr_kei02370", 256, 64);

From 27dc886577be7b9a5adffd4598489608f0a8f721 Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Tue, 17 Nov 2015 21:44:00 +0000
Subject: [PATCH 15/32] merged lines

the first sound covered both lines, and the second sound was out of
place.
---
 Update/onik_002.txt | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index 854aee7..cf45d82 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -779,17 +779,8 @@ void main()
 	OutputLine(NULL, "「…で、ね☆",
 		   NULL, "\"...So, now then.☆", Line_WaitForInput);
 	PlaySE(3, "s19/02/990200096", 256, 64);
-	OutputLine(NULL, "　そろそろお昼にしないかな？",
-		   NULL, " About time to have lunch, maybe?", Line_ContinueAfterTyping);
-
-	Wait( 300 );
-
-	PlaySE(3, "s19/02/500200521", 256, 64);
-	OutputLine(NULL, "…かな？」",
-		   NULL, " ...Maybe?\"", Line_WaitForInput);
-	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
-
-
+	OutputLine(NULL, "　そろそろお昼にしないかな？…かな？」",
+		   NULL, " About time to have lunch, maybe? ...Maybe?", Line_ContinueAfterTyping);
 
 //　レナが最高の笑顔と共に、魅音と二人して忘れようとしていた時間の訪れを告げた＠
 	OutputLine(NULL, "　レナが最高の笑顔と共に、魅音と二人して忘れようとしていた時間の訪れを告げた。",

From f3a4206465242329b713441e98e4fc8b079b9e9e Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Tue, 17 Nov 2015 21:47:12 +0000
Subject: [PATCH 16/32] removed extraneous sound

the first sound file already includes this, and playing this second file
truncated the first.
---
 Update/onik_002.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index cf45d82..9fe1d96 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -1155,7 +1155,6 @@ void main()
 
 	Wait( 400 );
 
-	PlaySE(3, "s19/04/500400222", 256, 64);
 	OutputLine(NULL, "梨花ぁ！」",
 		   NULL, " Rikaa!\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);

From 4203336f998ed7331a2d81cec886b9ce81161d5c Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Wed, 18 Nov 2015 07:28:34 +0000
Subject: [PATCH 17/32] Revert "merged lines"

This reverts commit 27dc886577be7b9a5adffd4598489608f0a8f721.
---
 Update/onik_002.txt | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index 9fe1d96..cfedb3a 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -779,8 +779,17 @@ void main()
 	OutputLine(NULL, "「…で、ね☆",
 		   NULL, "\"...So, now then.☆", Line_WaitForInput);
 	PlaySE(3, "s19/02/990200096", 256, 64);
-	OutputLine(NULL, "　そろそろお昼にしないかな？…かな？」",
-		   NULL, " About time to have lunch, maybe? ...Maybe?", Line_ContinueAfterTyping);
+	OutputLine(NULL, "　そろそろお昼にしないかな？",
+		   NULL, " About time to have lunch, maybe?", Line_ContinueAfterTyping);
+
+	Wait( 300 );
+
+	PlaySE(3, "s19/02/500200521", 256, 64);
+	OutputLine(NULL, "…かな？」",
+		   NULL, " ...Maybe?\"", Line_WaitForInput);
+	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
+
+
 
 //　レナが最高の笑顔と共に、魅音と二人して忘れようとしていた時間の訪れを告げた＠
 	OutputLine(NULL, "　レナが最高の笑顔と共に、魅音と二人して忘れようとしていた時間の訪れを告げた。",

From d4b018792533efa8cf729e5dbcd4eb8404e9bb5a Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Wed, 18 Nov 2015 07:30:15 +0000
Subject: [PATCH 18/32] better "merge"

realized that I only had to remove the extraneous sound file to fix this
part.
---
 Update/onik_002.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index cfedb3a..1623a7f 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -784,7 +784,6 @@ void main()
 
 	Wait( 300 );
 
-	PlaySE(3, "s19/02/500200521", 256, 64);
 	OutputLine(NULL, "…かな？」",
 		   NULL, " ...Maybe?\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);

From c58414aa98f5e617549c71b1ba905d7c1b2cbbd5 Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Wed, 18 Nov 2015 07:39:27 +0000
Subject: [PATCH 19/32] Revert "sound clipped"

This reverts commit ca5b05d9c70b5c2fc3bdf86c100c6ea45062f880.
---
 Update/onik_002.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index 1623a7f..25c3ebe 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -3138,7 +3138,7 @@ void main()
 		   NULL, "\"A Colonel Sanders doll!?", Line_WaitForInput);
 	PlaySE(3, "s19/01/hr_kei02360", 256, 64);
 	OutputLine(NULL, "　…ってあれか、ケンタくんフライドチキンの店の前に必ず置いてある…",
-		   NULL, " ...Oh, that thing. Those statues they always have out in front of that fried chicken place...", Line_WaitForInput);
+		   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);

From 6810c698d2e5999cd42aba1cd34752007dba3af1 Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Wed, 18 Nov 2015 07:40:38 +0000
Subject: [PATCH 20/32] sound correction

previous correction wasn't quite right, reverted and did the right
thing.
the deleted sound doesn't belong here, and its line is already in the
sound file playing at the time.
---
 Update/onik_002.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index 25c3ebe..1ada3c8 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -3141,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);

From b254c07acb37675a0250ad453ffcefc7ea56b5f4 Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Wed, 18 Nov 2015 08:03:00 +0000
Subject: [PATCH 21/32] fixed wait timing

now the text appears at about the right time for the audio
---
 Update/onik_002.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index 1ada3c8..d6513b5 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -1161,7 +1161,7 @@ void main()
 	OutputLine(NULL, "「そんなことは許せませんのー！！！",
 		   NULL, "\"I will not allow that!!!", Line_ContinueAfterTyping);
 
-	Wait( 400 );
+	Wait( 2000 );
 
 	OutputLine(NULL, "梨花ぁ！」",
 		   NULL, " Rikaa!\"", Line_WaitForInput);

From cc100d2a38de2afcce1c73fda53d1f00cb9e875c Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Wed, 18 Nov 2015 08:07:24 +0000
Subject: [PATCH 22/32] timing

fixed wait
---
 Update/onik_002.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index d6513b5..4deaca4 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -782,7 +782,7 @@ void main()
 	OutputLine(NULL, "　そろそろお昼にしないかな？",
 		   NULL, " About time to have lunch, maybe?", Line_ContinueAfterTyping);
 
-	Wait( 300 );
+	Wait( 1200 );
 
 	OutputLine(NULL, "…かな？」",
 		   NULL, " ...Maybe?\"", Line_WaitForInput);

From 33134c58646ea2c56f405188bca58ce93595f5da Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Wed, 18 Nov 2015 08:49:37 +0000
Subject: [PATCH 23/32] audio timing and flow

---
 Update/onik_tips_03.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Update/onik_tips_03.txt b/Update/onik_tips_03.txt
index efbbef5..92fe578 100644
--- a/Update/onik_tips_03.txt
+++ b/Update/onik_tips_03.txt
@@ -197,7 +197,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);

From ad0c3e4555e51f40010fdfd1a515bc0fbf4c447e Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Wed, 18 Nov 2015 08:52:06 +0000
Subject: [PATCH 24/32] sound fix

extraneous sound removed, timing fixed
---
 Update/onik_002.txt | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Update/onik_002.txt b/Update/onik_002.txt
index 4deaca4..29cecca 100644
--- a/Update/onik_002.txt
+++ b/Update/onik_002.txt
@@ -3223,9 +3223,7 @@ void main()
 	PlaySE(3, "s19/02/990200164", 256, 64);
 	OutputLine(NULL, "「圭一くんが手伝ってくれる☆",
 		   NULL, "\"Keiichi-kun is going to help.☆", Line_ContinueAfterTyping);
-
-	Wait( 300 );
-	PlaySE(3, "s19/02/990200165", 256, 64);
+	Wait( 1500 );
 	OutputLine(NULL, "…ケンタくんをお持ち帰りできる……はぅ…。」",
 		   NULL, " ...I can take Colonel Sanders home... hao...\"", Line_WaitForInput);
 	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);

From e04eaeac46cb1e2865aaf17c5a30d020e7aaef8e Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Wed, 18 Nov 2015 08:53:46 +0000
Subject: [PATCH 25/32] timing & flow

---
 Update/onik_tips_03.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Update/onik_tips_03.txt b/Update/onik_tips_03.txt
index 92fe578..3ad8f62 100644
--- a/Update/onik_tips_03.txt
+++ b/Update/onik_tips_03.txt
@@ -114,7 +114,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);

From a317edd1dd6f4338dabb2434c888e957154a23cf Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Wed, 18 Nov 2015 08:55:14 +0000
Subject: [PATCH 26/32] timing & flow

---
 Update/onik_tips_03.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Update/onik_tips_03.txt b/Update/onik_tips_03.txt
index 3ad8f62..500a785 100644
--- a/Update/onik_tips_03.txt
+++ b/Update/onik_tips_03.txt
@@ -267,7 +267,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);

From e83d1c41bc20c70ed568e28b79678360e4c1533e Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Wed, 18 Nov 2015 08:56:41 +0000
Subject: [PATCH 27/32] timing & flow

---
 Update/onik_tips_03.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Update/onik_tips_03.txt b/Update/onik_tips_03.txt
index 500a785..deac2b6 100644
--- a/Update/onik_tips_03.txt
+++ b/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();

From d875f74e0d6f97c2cacc28086ad5cd5ecceb9409 Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Wed, 18 Nov 2015 08:57:18 +0000
Subject: [PATCH 28/32] timing & flow

---
 Update/onik_tips_03.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Update/onik_tips_03.txt b/Update/onik_tips_03.txt
index deac2b6..d163f1d 100644
--- a/Update/onik_tips_03.txt
+++ b/Update/onik_tips_03.txt
@@ -186,8 +186,9 @@
 //「あー、諸君らの楽しい想像をぶち壊すようで悪いが、うちは金持ちでも貧乏でもないぞ＠極めて平均的な普通の家庭だ。＠
 	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);
-	OutputLine(NULL, "極めて平均的な普通の家庭だ。」",
+		   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);
 

From f987538ed4f2bfe7fab4d413d2053d5f40f8bad4 Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Wed, 18 Nov 2015 17:51:23 +0000
Subject: [PATCH 29/32] PG edit

changed to match PS3 voices
---
 Update/onik_tips_02.txt | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/Update/onik_tips_02.txt b/Update/onik_tips_02.txt
index 2e7d3fc..29b7ac6 100644
--- a/Update/onik_tips_02.txt
+++ b/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);
-	OutputLine(NULL, "この時期のズボンの股座がどれだけ蒸すか、女のお前にゃわかるまい！」",
-		   NULL, " A girl like you just wouldn't understand.  Wearing jeans during this season and how steamy the crotch gets!\"", Line_Normal);
+		   NULL, "\"From how I see things, the skirt you're wearing looks like it would be much cooler.", Line_ContinueAfterTyping);
+	Wait ( 1500 );
+	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, "「……む、…蒸すんだ………、はぅ……。」",
-		   NULL, "\"...It... it gets steamy... Hao...\"", Line_WaitForInput);
+	OutputLine(NULL, "「……あ、…暑いって………、はぅ……。」",
+		   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);

From d1895bba26ed6076fa75b043115db8313f5d500e Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Wed, 18 Nov 2015 18:44:11 +0000
Subject: [PATCH 30/32] translation fix

In Japan, permanent marker is referred to as "oil-based". I think this
translation mistake comes from not knowing that and just going with the
most obvious dictionary definition.
---
 Update/onik_003.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_003.txt b/Update/onik_003.txt
index 5f1be55..24f52f3 100644
--- a/Update/onik_003.txt
+++ b/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);

From d6e532c35c64dcea5a4d33482df1ec033cd1270d Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Wed, 18 Nov 2015 18:50:48 +0000
Subject: [PATCH 31/32] oil-based correction #2

I never heard a permanent marker being called oil-based in the English
language before! (but it's normal in Japanese)
---
 Update/onik_003.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Update/onik_003.txt b/Update/onik_003.txt
index 24f52f3..2f4ca8f 100644
--- a/Update/onik_003.txt
+++ b/Update/onik_003.txt
@@ -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();
 
 
@@ -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();
 
 

From 7cd3460d657fec64023f86310449ad9da6f58636 Mon Sep 17 00:00:00 2001
From: Norgus <git@nelliphant.33mail.com>
Date: Wed, 18 Nov 2015 18:58:24 +0000
Subject: [PATCH 32/32] grammar + small translation fix

---
 Update/onik_003.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Update/onik_003.txt b/Update/onik_003.txt
index 2f4ca8f..6b25e79 100644
--- a/Update/onik_003.txt
+++ b/Update/onik_003.txt
@@ -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);