Merge master

2017-07-05 17:46:58 +02:00
parent fb088dcc13 39a44c8fbd
commit 34ea9d5e1c
16 changed files with 32 additions and 32 deletions
--- a/Update/onik_015.txt
+++ b/Update/onik_015.txt
@@ -3860,7 +3860,7 @@ void main()

 	PlaySE( 4, "wa_003", 128, 64 );
 	ShakeScreenSx( 1, 2, );
-	OutputLineAll(NULL, "", Line_WaitForInput);
+	OutputLineAll(NULL, "", Line_Normal);

 	ClearMessage();