Merge master

This commit is contained in:
Jáchym Toušek
2017-07-05 17:46:58 +02:00
16 changed files with 32 additions and 32 deletions

View File

@@ -638,7 +638,7 @@ void main()
PlaySE( 4, "wa_007", 128, 64 );
ShakeScreenSx( 1, 2, );
OutputLineAll(NULL, "", Line_WaitForInput);
OutputLineAll(NULL, "", Line_Normal);
ClearMessage();
@@ -1824,7 +1824,7 @@ void main()
// PlaySE( 4, "wa_007", 128, 64 );
// ShakeScreen( 1, 50, 20, 3, 0, );
OutputLineAll(NULL, "", Line_WaitForInput);
OutputLineAll(NULL, "", Line_Normal);
ClearMessage();
DisableWindow();
@@ -2308,7 +2308,7 @@ void main()
PlaySE( 4, "wa_007", 128, 64 );
ShakeScreen( 1, 50, 20, 3, 0, );
DrawScene( "bg_108", 200 );
OutputLineAll(NULL, "", Line_WaitForInput);
OutputLineAll(NULL, "", Line_Normal);
ClearMessage();
@@ -2380,7 +2380,7 @@ void main()
PlaySE( 4, "wa_007", 128, 64 );
ShakeScreen( 1, 50, 20, 3, 0, );
OutputLine(NULL, "逆転勝利だッッ!!!!!!!",
NULL, " comeback victory!!!!!!!", Line_ModeSpecific);
NULL, " comeback victory!!!!!!!", Line_Normal);
ClearMessage();
DisableWindow();
DrawSceneWithMask( "bg_108", "right", 0, 0, 300 );