upstream update

scripts/ch1/init.txt

@@ -131,38 +131,55 @@ void main()
 	ModAddArtset("Original", "オリジナル", "OGBackgrounds:OGSprites:CG");
 
 	// GAltBGM controls which of these are selected
-	ModAddBGMset("New BGM", "Placeholder", "BGM");
+	ModAddBGMset("New Mangagamer", "Placeholder", "April2019BGM:BGM");
 	ModAddBGMset("GIN's BGM", "Placeholder", "OGBGM:BGM");
-	ModAddBGMset("Hou+", "Placeholder", "HouPlusBGM:BGM");
+	ModAddBGMset("Hou+ Demo", "Placeholder", "HouPlusDemoBGM:BGM");
+	ModAddBGMset("Hou+ BGM", "Placeholder", "HouPlusBGM:BGM");
 
 	// GAltSE controls which of these are selected
 	ModAddSEset("New SE", "Placeholder", "SE");
 	ModAddSEset("GIN's SE", "Placeholder", "OGSE:SE");
 
 	// Audio presets the user can select, consisting of a combination of the BGM and SE flags
 	ModAddAudioset(
-		"New Mangagamer BGM/SE",
-		"Use the new Background Music (BGM) and Sound Effects (SE) introduced by MangaGamer in the April 2019 update",
-		"JP: New Mangagamer BGM/SE",
-		"JP: Use the new Background Music (BGM) and Sound Effects (SE) introduced by MangaGamer in the April 2019 update",
+		"New Mangagamer (2019)",
+		"Use the new Background Music (BGM) and Sound Effects (SE) introduced by MangaGamer in the April 2019 update
+
+		It uses the conversions of nerve's tracks that made their debut in the original Japanese release of Hou Compilation (2014), but all of the AI-D-IA tracks were replaced. Most of the replacements are from the soundtracks of Kai and Rei, but there are also some new tracks whose composer is unknown.",
+		"New Mangagamer (2019)",
+		"Use the new Background Music (BGM) and Sound Effects (SE) introduced by MangaGamer in the April 2019 update
+
+		It uses the conversions of nerve's tracks that made their debut in the original Japanese release of Hou Compilation (2014), but all of the AI-D-IA tracks were replaced. Most of the replacements are from the soundtracks of Kai and Rei, but there are also some new tracks whose composer is unknown.",
 		0, // GAltBGM
 		0, // GAltBGMFlow
 		0, // GAltSE
 		0  // GAltSEFlow
 	);
 
 	ModAddAudioset(
-		"GIN's BGM/SE",
-		"This option uses GIN's Background Music (BGM) and Sound Effects (SE), which bring the BGM/SE closer (but definitely NOT identical to) the original Japanese release and/or Pre April Update.
+		"GIN / Hou BGM (2014)",
+		"This option uses GIN's Background Music (BGM) and Sound Effects (SE), which is virtually identical to what was included in the original Japanese release of Hou Compilation (2014) in terms of BGM.
 
 		Please click on the 'Open BGM/SE FAQ' button to view the 07th-mod wiki for more details.
 
+		All of the tracks that make their debut in Onikakushi and the character themes are by AI-D-IA and were taken from the original Japanese release of Himatsubushi. Most of the remaining tracks are based on MIDIs from nerve.
+
+		However, because the original conversions of those were extremely poor, this pack instead uses the same conversions as the New MangaGamer BGM.
+
+		This option uses GIN's SE, which should be similar to the Pre-April Update SE.
+
 		This option was previously known as 'Original BGM/SE' or 'BGM/SE fix'.",
-		"JP: GIN's BGM/SE",
-		"JP: This option uses GIN's Background Music (BGM) and Sound Effects (SE), which bring the BGM/SE closer (but definitely NOT identical to) the original Japanese release and/or Pre April Update.
+		"GIN / Hou BGM (2014)",
+		"This option uses GIN's Background Music (BGM) and Sound Effects (SE), which is virtually identical to what was included in the original Japanese release of Hou Compilation (2014) in terms of BGM.
 
 		Please click on the 'Open BGM/SE FAQ' button to view the 07th-mod wiki for more details.
 
+		All of the tracks that make their debut in Onikakushi and the character themes are by AI-D-IA and were taken from the original Japanese release of Himatsubushi. Most of the remaining tracks are based on MIDIs from nerve.
+
+		However, because the original conversions of those were extremely poor, this pack instead uses the same conversions as the New MangaGamer BGM.
+
+		This option uses GIN's SE, which should be similar to the Pre-April Update SE.
+
 		This option was previously known as 'Original BGM/SE' or 'BGM/SE fix'.",
 		1, // GAltBGM
 		1, // GAltBGMFlow
@@ -171,27 +188,58 @@ void main()
 	);
 
 	ModAddAudioset(
-		"Hou+ Demo BGM",
-		"This option replaces 16 BGM with BGM from the Higurashi Hou+ Demo. It uses the same tracks from nerve as the New MangaGamer BGM, but the AI-D-IA tracks are different.
+		"Hou+ Demo (2020)",
+		"This option replaces 16 BGM with BGM from the Higurashi Hou+ demo (2020). It uses the same conversions of nerve's tracks as the New MangaGamer BGM, but the replacements for the AI-D-IA tracks are different.
 
-		Some are remastered versions of MangaGamer's replacements, while others were newly composed by xaki.
+		Those by U2 Akiyama have been rearranged (except for one that's virtually unchanged), while the rest were replaced with new compositions by xaki.
 
 		This option is not available for Chapters 5-8 and Rei because most of their music isn't in the Hou+ demo.
 
-		All other tracks will use the New Mangagamer BGM and GIN's/Original SE.",
-		"JP: Hou+ Demo BGM",
-		"JP: This option replaces 16 BGM with BGM from the Higurashi Hou+ Demo. It uses the same tracks from nerve as the New MangaGamer BGM, but the AI-D-IA tracks are different.
+		All other tracks will use the New Mangagamer BGM and GIN's/Original SE.
+
+		This option uses GIN's SE, which should be similar to the Pre-April Update SE.
 
-		Some are remastered versions of MangaGamer's replacements, while others were newly composed by xaki.
+		Credits: Provided by Kilicool64",
+		"Hou+ Demo (2020)",
+		"This option replaces 16 BGM with BGM from the Higurashi Hou+ demo (2020). It uses the same conversions of nerve's tracks as the New MangaGamer BGM, but the replacements for the AI-D-IA tracks are different.
+
+		Those by U2 Akiyama have been rearranged (except for one that's virtually unchanged), while the rest were replaced with new compositions by xaki.
 
 		This option is not available for Chapters 5-8 and Rei because most of their music isn't in the Hou+ demo.
 
-		All other tracks will use the New Mangagamer BGM and GIN's/Original SE.",
+		All other tracks will use the New Mangagamer BGM and GIN's/Original SE.
+
+		This option uses GIN's SE, which should be similar to the Pre-April Update SE.
+
+		Credits: Provided by Kilicool64",
 		2, // GAltBGM
 		1, // GAltBGMFlow
 		1, // GAltSE
 		1  // GAltSEFlow
 	);
 
+	ModAddAudioset(
+		"Hou+ BGM (2022)",
+		"This option uses the BGM found in the full version of the Japanese release of Hou+ (2022).
+
+		Compared to the Hou+ demo (2020), the xaki track MIND THE GAP has been sped up, while the nerve tracks Fascism and Lie lies-lies lie were newly converted. Everything else is unchanged.
+
+		This option uses GIN's SE, which should be similar to the Pre-April Update SE.
+
+		Credits: Provided by Kilicool64",
+		"Hou+ BGM (2022)",
+		"This option uses the BGM found in the full version of the Japanese release of Hou+ (2022).
+
+		Compared to the Hou+ demo (2020), the xaki track MIND THE GAP has been sped up, while the nerve tracks Fascism and Lie lies-lies lie were newly converted. Everything else is unchanged.
+
+		This option uses GIN's SE, which should be similar to the Pre-April Update SE.
+
+		Credits: Provided by Kilicool64",
+		3, // GAltBGM
+		1, // GAltBGMFlow
+		1, // GAltSE
+		1  // GAltSEFlow
+	);
+
 	CallScript( "flow" );
 }

scripts/ch1/onik_002.txt

@@ -1881,7 +1881,7 @@ void main()
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(3, 2, "ps3/s19/02/990200117", 256, TRUE);
 	OutputLine(NULL, "「かぁいいかぁいい！！",
-		   NULL, "\"Kyuuuteee!!", Line_WaitForInput);
+		   NULL, "\"Kyuuute!!", Line_WaitForInput);
 	ModPlayVoiceLS(3, 2, "ps3/s19/02/990200118", 256, TRUE);
 	OutputLine(NULL, "……沙都子ちゃんもかぁいい…よぅ…☆……お持ち帰り…はぅ！」",
 		   NULL, " ...Satoko is so... kyute...☆ ...take you home...hau!\"", GetGlobalFlag(GLinemodeSp));

scripts/ch1/onik_004.txt

@@ -1863,7 +1863,7 @@ void main()
 		   NULL, " ...What is it? What is it!?", Line_WaitForInput);
 	ModPlayVoiceLS(3, 2, "ps3/s19/02/990200247", 256, TRUE);
 	OutputLine(NULL, "　…えぇ…？！」",
-		   NULL, " ...Haoh...!?\"", GetGlobalFlag(GLinemodeSp));
+		   NULL, " ...Hauu...!?\"", GetGlobalFlag(GLinemodeSp));
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 

scripts/ch1/onik_005.txt

@@ -259,7 +259,7 @@ void main()
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(3, 2, "ps3/s19/02/990200308", 256, TRUE);
 	OutputLine(NULL, "「……うん、かぁいいよ……はぅ……ほしぃよぅ……。」",
-		   NULL, "\"...Yeah, kyute... hao... I want it...\"", GetGlobalFlag(GLinemodeSp));
+		   NULL, "\"...Yeah, kyute... hau... I want it...\"", GetGlobalFlag(GLinemodeSp));
 
 	DisableWindow();
 	ModDrawCharacter(1, 4, "sprite/sa1a_akireru_a1_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
@@ -608,7 +608,7 @@ void main()
 		   NULL, "\"Our club's summer tradition!", Line_WaitForInput);
 	ModPlayVoiceLS(3, 3, "ps3/s19/03/990300270", 256, TRUE);
 	OutputLine(NULL, "　綿流祭四凶爆闘！！」",
-		   NULL, " The Watanagashi Four-Demon Fire Fight!\"", Line_Continue);
+		   NULL, " The Cotton Drifting Four-Demon Fire Fight!\"", Line_Continue);
 	PlaySE( 4, "wa_007", 56, 64 );
 	ShakeScreen( 0, 50, 20, 3, 0, );
 	OutputLineAll(NULL, "", Line_Normal);
@@ -1663,7 +1663,7 @@ void main()
 
 //えぇッ？！＠
 	OutputLine(NULL, "えぇッ？！」",
-		   NULL, " Haoh!?\"", GetGlobalFlag(GLinemodeSp));
+		   NULL, " Hauu!?\"", GetGlobalFlag(GLinemodeSp));
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
@@ -2238,7 +2238,7 @@ void main()
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(3, 2, "ps3/s19/02/990200344", 256, TRUE);
 	OutputLine(NULL, "「は…はぅ……。",
-		   NULL, "\"Ha... hao...", Line_WaitForInput);
+		   NULL, "\"Ha... hau...", Line_WaitForInput);
 	OutputLine(NULL, "…はい",
 		   NULL, " okay", Line_ContinueAfterTyping);
 	ModPlayVoiceLS(3, 2, "ps3/s19/02/990200345", 256, TRUE);
@@ -2934,7 +2934,7 @@ void main()
 	// (backup) SetValidityOfInput( TRUE );
 
 	OutputLine(NULL, "はぅ…",
-		   NULL, " hao...", Line_Continue);
+		   NULL, " hau...", Line_Continue);
 
 	// (backup) SetValidityOfInput( FALSE );
 	Wait( 300 );
@@ -4011,7 +4011,7 @@ void main()
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(3, 1, "ps3/s19/01/hr_kei07940", 256, TRUE);
 	OutputLine(NULL, "「ぇ、ええ？！？！",
-		   NULL, "\"H-Haouh!?!?", Line_WaitForInput);
+		   NULL, "\"H-Hauuu!?!?", Line_WaitForInput);
 	ModPlayVoiceLS(3, 1, "ps3/s19/01/hr_kei07950", 256, TRUE);
 	OutputLine(NULL, "　それ女子用だろッ？！",
 		   NULL, " This is for girls!?", Line_WaitForInput);

scripts/ch1/onik_009.txt

@@ -70,7 +70,7 @@ void main()
 //　その名も「綿流祭五凶爆闘」！＠
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　その名も「綿流祭五凶爆闘」！！",
-		   NULL, "It was called the Watanagashi Five-Demon Fire Fight!!", GetGlobalFlag(GLinemodeSp));
+		   NULL, "It was called the Cotton Drifting Five-Demon Fire Fight!!", GetGlobalFlag(GLinemodeSp));
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
@@ -360,7 +360,7 @@ void main()
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(3, 2, "ps3/s19/02/500200786", 256, TRUE);
 	OutputLine(NULL, "「はぅ！……はいおばさま〜〜〜！",
-		   NULL, "\"Hao!... Yes, Ma'am~~~!", Line_WaitForInput);
+		   NULL, "\"Hau!... Yes, Ma'am~~~!", Line_WaitForInput);
 	ModPlayVoiceLS(3, 2, "ps3/s19/02/500200787", 256, TRUE);
 	OutputLine(NULL, "　圭一くんはレナが命に替えましても〜☆」",
 		   NULL, " Even if it means I must sacrifice myself~.☆\"", GetGlobalFlag(GLinemodeSp));
@@ -1050,7 +1050,7 @@ void main()
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(3, 1, "ps3/s19/01/hr_kei33670", 256, TRUE);
 	OutputLine(NULL, "「おっしゃあぁああッ！！」",
-		   NULL, "\"Haoriiight!!\"", Line_Normal);
+		   NULL, "\"Hauuriiight!!\"", Line_Normal);
 	ClearMessage();
 
 	DisableWindow();
@@ -1688,7 +1688,7 @@ void main()
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(3, 5, "ps3/s19/05/500500289", 256, TRUE);
 	OutputLine(NULL, "「…もう見つけてありますです。…圭一もですね？」",
-		   NULL, "\"...We've already found it. ...Keiichi, too?\"", GetGlobalFlag(GLinemodeSp));
+		   NULL, "\"...I've already found it. ...Keiichi, too?\"", GetGlobalFlag(GLinemodeSp));
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
@@ -2539,7 +2539,7 @@ void main()
 		   NULL, "\"Gasp!?", Line_WaitForInput);
 	ModPlayVoiceLS(3, 2, "ps3/s19/02/500200835", 256, TRUE);
 	OutputLine(NULL, "　……はぅ、なんだ魅ぃちゃんかぁ……はぅ…。」",
-		   NULL, " ...Hao, oh it's Mii-chan... hau...\"", GetGlobalFlag(GLinemodeSp));
+		   NULL, " ...Hau, oh it's Mii-chan... hau...\"", GetGlobalFlag(GLinemodeSp));
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
@@ -2640,10 +2640,10 @@ void main()
 	// (backup) SetValidityOfInput( TRUE );
 
 	OutputLine(NULL, "オットセイ、」",
-		   NULL, " furry little seal.\"", Line_Continue);
+		   NULL, " furry little seal.\"", Line_ContinueAfterTyping);
 
 	// (backup) SetValidityOfInput( FALSE );
-	Wait( 1000 );
+	Wait( 300 );
 	// (backup) SetValidityOfInput( TRUE );
 
 	ClearMessage();
@@ -2690,7 +2690,7 @@ void main()
 	// (backup) SetValidityOfInput( TRUE );
 
 	OutputLine(NULL, "　えぇ？！",
-		   NULL, " Haoh!?", Line_Continue);
+		   NULL, " Hauu!?", Line_Continue);
 
 	// (backup) SetValidityOfInput( FALSE );
 	Wait( 200 );
@@ -6426,7 +6426,7 @@ void main()
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(3, 3, "ps3/s19/03/500300769", 256, TRUE);
 	OutputLine(NULL, "「はぅ〜、の「は」と「ぅ」の間くらいだったか…",
-		   NULL, "\"Between the 'ha' and 'o' of her hau~ I...", Line_Continue);
+		   NULL, "\"Between the 'ha' and 'u' of her hau~ I...", Line_Continue);
 
 	// (backup) SetValidityOfInput( FALSE );
 	Wait( 300 );

scripts/ch1/onik_009_02.txt

@@ -1383,7 +1383,7 @@ void main()
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(3, 1, "ps3/s01/01/120100022", 256, TRUE);
 	OutputLine(NULL, "「………………。」",
-		   NULL, "\"....\"", GetGlobalFlag(GLinemodeSp));
+		   NULL, "\"...\"", GetGlobalFlag(GLinemodeSp));
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
@@ -1634,10 +1634,10 @@ void main()
 	ModPlayVoiceLS(3, 8, "ps3/s01/08/120800060", 256, TRUE);
 	OutputLine(NULL, "残った１人だって時間の問題さ。",
 		   NULL, " It's only a matter of time for the last one.", Line_WaitForInput);
-	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(3, 8, "ps3/s01/08/120800061", 256, TRUE);
 	OutputLine(NULL, "動機だって、酒の上での口論からと判明してる。",
 		   NULL, " The motive turned out to have been an argument they had while intoxicated. ", GetGlobalFlag(GLinemodeSp));
+	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(3, 8, "ps3/s01/08/120800062", 256, TRUE);
 	OutputLine(NULL, "祟りなんかじゃない。",
 		   NULL, "That's no curse.", Line_WaitForInput);

scripts/ch1/onik_010.txt

@@ -411,7 +411,7 @@ void main()
 //　今度は俺も、黙っている側の人間なのだ￥
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　今度は俺も、黙っている側の人間なのだ。",
-		   NULL, "And now, I was one of ones who needed to keep their mouths shut.", Line_Normal);
+		   NULL, "And now, I was one of the ones who needed to keep their mouths shut.", Line_Normal);
 	ClearMessage();
 
 
@@ -1811,7 +1811,7 @@ void main()
 //　その中を、暑そうに小脇にジャケットを抱え、だらしなくネクタイを緩めた中年のおっさんが待ち受けていた￥
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　その中を、暑そうに小脇にジャケットを抱え、だらしなくネクタイを緩めた中年のおっさんが待ち受けていた。",
-		   NULL, "Waiting there, looking uncomfortably warm, was a middle-aged man, his tie sloppily loosened, and his jacket tucked underneath his arm..", Line_Normal);
+		   NULL, "Waiting there, looking uncomfortably warm, was a middle-aged man, his tie sloppily loosened, and his jacket tucked underneath his arm...", Line_Normal);
 	ClearMessage();
 
 

scripts/ch1/onik_011.txt

@@ -2218,7 +2218,7 @@ void main()
 		   NULL, " It has to be.", Line_WaitForInput);
 	ModPlayVoiceLS(3, 2, "ps3/s01/02/120200094", 256, TRUE);
 	OutputLine(NULL, "レナも最初、そうだったから。",
-		   NULL, " Rena was also like that at first, too.", Line_WaitForInput);
+		   NULL, " I was also like that at first, too.", Line_WaitForInput);
 	ModPlayVoiceLS(3, 2, "ps3/s01/02/120200095", 256, TRUE);
 	OutputLine(NULL, "わかるんだよ？",
 		   NULL, " I can tell, you know?", Line_Continue);

scripts/ch1/onik_012.txt

@@ -1057,7 +1057,7 @@ void main()
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#956f6e>圭一</color>", NULL, "<color=#956f6e>Keiichi</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(3, 1, "ps3/s01/01/120100278", 256, TRUE);
 	OutputLine(NULL, "「あの、…漫画なんかによくあるじゃないですか。",
-		   NULL, "\"Um... you know that thing you see in comics all the time?", Line_WaitForInput);
+		   NULL, "\"Um... you know that thing you see in manga all the time?", Line_WaitForInput);
 	ModPlayVoiceLS(3, 1, "ps3/s01/01/120100279", 256, TRUE);
 	OutputLine(NULL, "体内に取り込まれると分解したりして、証拠が何も残らないなんて、そんな薬…。」",
 		   NULL, " Where there's a drug that doesn't leave any traces after being consumed...\"", GetGlobalFlag(GLinemodeSp));