Merge remote-tracking branch 'origin/master' into lip-sync

This commit is contained in:
Jáchym Toušek
2018-01-21 14:35:29 +01:00
6 changed files with 41 additions and 5 deletions

View File

@@ -258,7 +258,7 @@ void main()
DisableWindow();
FadeOutBGM( 1, 1000, TRUE );
FadeOutBGM( 2, 1000, TRUE );
PlaySE( 4, "wa013", 128, 64 );
PlaySE( 4, "wa_013", 128, 64 );
DrawScene( "white", 10 );
DrawScene( "bg_165", 50 );
ModDrawCharacterWithFiltering(3, 11, "character/normal/oisi1_1_", "0", "right", 1, 160, 0, FALSE, 0, 0, 0, 0, 0, 20, 300, TRUE );