Merge master

This commit is contained in:
Jáchym Toušek
2017-07-13 23:21:38 +02:00
10 changed files with 20 additions and 52 deletions

View File

@@ -419,8 +419,7 @@ void main()
NULL, "\"Wh-What is this, what is this!?", Line_ContinueAfterTyping);
Wait (2000)
OutputLine(NULL, " 圭一くんと魅ぃちゃんが悪代官だよ?",
NULL, " Keiichi-kun and Mii-chan are an evil bailiff and...?", Line_ContinueAfterTyping);
Wait (800)
NULL, " Keiichi-kun and Mii-chan are an evil bailiff and...?", Line_WaitForInput);
PlaySE(3, "s20/02/440200037", 128, 64);
OutputLine(NULL, " 越後屋だよ?!」",
NULL, " a con man!?\"", Line_Normal);