Merge branch 'master' of https://github.com/07th-mod/onikakushi
This commit is contained in:
@@ -113,11 +113,10 @@ void main()
|
||||
DisableWindow();
|
||||
FadeBustshot( 2, FALSE, 0, 0, 0, 0, 0, TRUE );
|
||||
|
||||
// それはみんなランディーくん同様、町を歩けばどこかで見かけるようなものばかりだった@
|
||||
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
|
||||
OutputLine(NULL, " それはみんなランディーくん同様、町を歩けばどこかで見かけるようなものばかりだった。",
|
||||
NULL, "They were all the same as Colonel Randy: stuff you'd see while walking around in town.", GetGlobalFlag(GLinemodeSp));
|
||||
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
|
||||
//VoiceMatching
|
||||
if(GetGlobalFlag(GCensor) >= 2){ModCallScriptSection("zonik_005_vm0x_n01","dialog001");}
|
||||
if(GetGlobalFlag(GCensor) <= 1){ModCallScriptSection("zonik_005_vm00_n01","dialog001");}
|
||||
//VoiceMatchingEnd
|
||||
|
||||
// ケーキ屋さんの店頭のペロちゃん人形@
|
||||
if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
|
||||
@@ -1701,8 +1700,8 @@ void main()
|
||||
ModDrawCharacter(2, 4, "sprite/normal/sa1b_odoroki_b1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
|
||||
|
||||
//VoiceMatching
|
||||
if(GetGlobalFlag(GCensor) >= 2){ModCallScriptSection("zonik_005_vm0x_n01","dialog001");}
|
||||
if(GetGlobalFlag(GCensor) <= 1){ModCallScriptSection("zonik_005_vm00_n01","dialog001");}
|
||||
if(GetGlobalFlag(GCensor) >= 2){ModCallScriptSection("zonik_005_vm0x_n01","dialog004");}
|
||||
if(GetGlobalFlag(GCensor) <= 1){ModCallScriptSection("zonik_005_vm00_n01","dialog004");}
|
||||
//VoiceMatchingEnd
|
||||
|
||||
|
||||
@@ -1857,12 +1856,10 @@ void main()
|
||||
DisableWindow();
|
||||
ModDrawCharacterWithFiltering(1, 5, "sprite/normal/ri1_def_a1_", "0", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );
|
||||
|
||||
//「…校長先生のエアリアル起動技です。@
|
||||
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
|
||||
ModPlayVoiceLS(3, 5, "s19/05/990500067", 256, TRUE);
|
||||
OutputLine(NULL, "「…校長先生、超奥義発動です。」",
|
||||
NULL, "\"...The principal's special launcher move just started.\"", GetGlobalFlag(GLinemodeSp));
|
||||
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
|
||||
//VoiceMatching
|
||||
if(GetGlobalFlag(GCensor) >= 2){ModCallScriptSection("zonik_005_vm0x_n01","dialog002");}
|
||||
if(GetGlobalFlag(GCensor) <= 1){ModCallScriptSection("zonik_005_vm00_n01","dialog002");}
|
||||
//VoiceMatchingEnd
|
||||
|
||||
|
||||
|
||||
@@ -4105,20 +4102,18 @@ void main()
|
||||
//mov %Rika_isyou,1
|
||||
|
||||
//VoiceMatching
|
||||
if(GetGlobalFlag(GCensor) >= 4){ModCallScriptSection("zonik_005_vm0x_n01","dialog002");}
|
||||
if(GetGlobalFlag(GCensor) <= 3){ModCallScriptSection("zonik_005_vm00_n01","dialog002");}
|
||||
if(GetGlobalFlag(GCensor) >= 4){ModCallScriptSection("zonik_005_vm0x_n01","dialog005");}
|
||||
if(GetGlobalFlag(GCensor) <= 3){ModCallScriptSection("zonik_005_vm00_n01","dialog005");}
|
||||
//VoiceMatchingEnd
|
||||
|
||||
DisableWindow();
|
||||
DrawSceneWithMask("background/gk1", "down", 0, 0, 1300 );
|
||||
ModDrawCharacterWithFiltering(1, 2, "sprite/normal/re3b_warai_b1_", "2", "right", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );
|
||||
|
||||
//「あははは~圭一くん、前屈みだぁぁ……かぁいいかぁいいッ!!@
|
||||
if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
|
||||
ModPlayVoiceLS(3, 2, "s19/02/990200368", 256, TRUE);
|
||||
OutputLine(NULL, "「あははは〜圭一くん、…かぁいいかぁいいッ!!」",
|
||||
NULL, "\"Ahahaha~ Keiichi-kun is so... kyute kyute!!\"", GetGlobalFlag(GLinemodeSp));
|
||||
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
|
||||
//VoiceMatching
|
||||
if(GetGlobalFlag(GCensor) >= 4){ModCallScriptSection("zonik_005_vm0x_n01","dialog003");}
|
||||
if(GetGlobalFlag(GCensor) <= 3){ModCallScriptSection("zonik_005_vm00_n01","dialog003");}
|
||||
//VoiceMatchingEnd
|
||||
|
||||
|
||||
|
||||
@@ -4364,8 +4359,8 @@ void main()
|
||||
|
||||
|
||||
//VoiceMatching
|
||||
if(GetGlobalFlag(GCensor) >= 2){ModCallScriptSection("zonik_005_vm0x_n01","dialog003");}
|
||||
if(GetGlobalFlag(GCensor) <= 1){ModCallScriptSection("zonik_005_vm00_n01","dialog003");}
|
||||
if(GetGlobalFlag(GCensor) >= 2){ModCallScriptSection("zonik_005_vm0x_n01","dialog006");}
|
||||
if(GetGlobalFlag(GCensor) <= 1){ModCallScriptSection("zonik_005_vm00_n01","dialog006");}
|
||||
//VoiceMatchingEnd
|
||||
|
||||
FadeOutBGM( 1, 1000, TRUE );
|
||||
|
||||
Reference in New Issue
Block a user