Merge branch 'mg'

# Conflicts: # Update/_tsum_005.txt
07th-mod · Jun 22, 2018 · 4df4cfc · 4df4cfc
2 parents c9ef7b1 + 71c75dd
commit 4df4cfc
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/Update/_tsum_001.txt b/Update/_tsum_001.txt
@@ -3172,6 +3172,7 @@ void main()
 	SetValidityOfInput( FALSE );
 	Wait( 800 );
 	SetValidityOfInput( TRUE );
+	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
 
 	PlayVoice(4, "ps3/s09/01/hr_kei22690", 128);
 	OutputLine(NULL, "「あぁ恨まない！！",

diff --git a/Update/_tsum_005.txt b/Update/_tsum_005.txt
@@ -553,7 +553,7 @@ void main()
 
 	PlayVoice(4, "ps3/s09/00/173000011", 128);
 	OutputLine(NULL, "\nお父さんと別れて、アキヒトおじさんと結婚しようと思うの。」",
-			NULL, " about divorcing your father and getting married to Akihito-san.\"", Line_Normal);
+		   NULL, " about divorcing your father and getting married to Akihito-san.\"", Line_Normal);
 	ClearMessage();
 
 	MoveSprite( 1, 0, 0, 0, 0, 256, 0, 0, 0, TRUE );
@@ -698,7 +698,6 @@ void main()
 
 	OutputLine(NULL, "　だから。",
 		   NULL, "So...", Line_WaitForInput);
-	OutputLine(NULL, "　だから。",
 	OutputLine(NULL, "……これは母の裏切り行為だと思った。",
 		   NULL, " I took her decision as a betrayal.", Line_Normal);
 	ClearMessage();
@@ -725,8 +724,7 @@ void main()
 
 	OutputLine(NULL, "　お父さんはずっとお母さんを影で支えてきてくれたのに、これじゃああんまりにお父さんが可哀想だ。",
 		   NULL, "He has been doing nothing but support you patiently this whole time. How could you do such a cruel thing to him?", Line_WaitForInput);
-	OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping);
-
+	OutputLineAll(NULL, "\n", Line_ContinueAfterTyping);
 
 	OutputLine(NULL, "　そう、あらん限りの声で叫んだ。",
 		   NULL, "I screamed as loud as I could.", Line_Normal);

diff --git a/Update/_tsum_012_2.txt b/Update/_tsum_012_2.txt
@@ -510,7 +510,6 @@ void main()
 	PlaySE( 0, "s_Kyupiin", 128, 64 );
 	DrawBustshot( 13, "white", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
 	DrawBustshot( 13, "black", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, TRUE );
-	DrawScene( "black", 0 );
 
 	DisableWindow();
 	DrawSprite( 0, "Me_eyex2", NULL, 90-320, 100-240, 0, 0, 0, 0, FALSE, FALSE, 0, 256-90, 20, 0, TRUE );

diff --git a/Update/_tsum_026.txt b/Update/_tsum_026.txt
@@ -5165,7 +5165,7 @@ void main()
 
 
 	OutputLine(NULL, "　あぁ畜生、俺も混ざりたいってなッ！！",
-		   NULL, "We want to join them!!'", Line_Normal);
+		   NULL, "'We want to join them!!'", Line_Normal);
 	ClearMessage();
 
 	DrawBustshot( 0, "Re_waraiA1#", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 9, 0, FALSE );

diff --git a/Update/_tsum_tips_012.txt b/Update/_tsum_tips_012.txt
@@ -234,7 +234,7 @@ void main()
 	SetSpeedOfMessage( FALSE, 0 );
 	OutputLineAll(NULL, "", Line_Normal);
 
-ClearMessage();
+	ClearMessage();
 
 	Wait( 1000 );
 	DrawScene( "black", 1000 );