Merge pull request #25 from VasteelXolotl/master

07th-mod · Oct 13, 2020 · 573ae00 · 573ae00
2 parents ab17e1f + 6f31532
commit 573ae00
Show file tree

Hide file tree

Showing 16 changed files with 8 additions and 8 deletions.
diff --git a/CG/2choices-negative.png b/CG/2choices-negative.png
diff --git a/CG/2choices.png b/CG/2choices.png
diff --git a/CG/text/menu.png b/CG/text/menu.png
diff --git a/CG/text/menu_a.png b/CG/text/menu_a.png
diff --git a/CG/text/menu_a_j.png b/CG/text/menu_a_j.png
diff --git a/CG/text/menu_b.png b/CG/text/menu_b.png
diff --git a/CG/text/menu_b_j.png b/CG/text/menu_b_j.png
diff --git a/CG/text/menu_j.png b/CG/text/menu_j.png
diff --git a/CG/text/mina_katari11.png b/CG/text/mina_katari11.png
diff --git a/CG/text/mina_katari21.png b/CG/text/mina_katari21.png
diff --git a/CG/windo_filter_adv.png b/CG/windo_filter_adv.png
diff --git a/CGAlt/sprite/oko_def_0.png b/CGAlt/sprite/oko_def_0.png
diff --git a/OGSprites/minacubemap.png b/OGSprites/minacubemap.png
diff --git a/OGSprites/sprite/oko_def_0.png b/OGSprites/sprite/oko_def_0.png
diff --git a/Update/_mina_025.txt b/Update/_mina_025.txt
@@ -2545,7 +2545,7 @@ void main()
 	PlayBGM( 2, "suzume", 56, 0 );
 	DrawScene( "background/hu2", 1000 );
 
-	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>雲雀</color>", NULL, "<color=#f5e6d3>Hibari</color>", NULL, Line_ContinueAfterTyping); }
+	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>雲雀</color>", NULL, "<color=#f5e6d3>Skylark</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 0, "ps3/s12/00/hiba28001", 256, TRUE);
 	OutputLine(NULL, "「こちら雲雀。",
 		   NULL, "\"This is Skylark.", Line_WaitForInput);
@@ -2566,7 +2566,7 @@ void main()
 		   NULL, " Continue observation.\"", Line_Normal);
 	ClearMessage();
 
-	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>雲雀</color>", NULL, "<color=#f5e6d3>Hibari</color>", NULL, Line_ContinueAfterTyping); }
+	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>雲雀</color>", NULL, "<color=#f5e6d3>Skylark</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 0, "ps3/s12/00/hiba28004", 256, TRUE);
 	OutputLine(NULL, "「Ｒと接触。",
 		   NULL, "\"Encountering R.", Line_WaitForInput);
@@ -2575,7 +2575,7 @@ void main()
 		   NULL, " She let the officer inside.\"", GetGlobalFlag(GLinemodeSp));
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
-	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>雲雀</color>", NULL, "<color=#f5e6d3>Hibari</color>", NULL, Line_ContinueAfterTyping); }
+	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>雲雀</color>", NULL, "<color=#f5e6d3>Skylark</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 0, "ps3/s12/00/hiba28006", 256, TRUE);
 	OutputLine(NULL, "「興宮署にＲから連絡があったようです。",
 		   NULL, "\"R called the Okinomiya police department.", Line_WaitForInput);
@@ -2590,7 +2590,7 @@ void main()
 		   NULL, "\"Did she tell them about us...?\"", Line_Normal);
 	ClearMessage();
 
-	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>雲雀</color>", NULL, "<color=#f5e6d3>Hibari</color>", NULL, Line_ContinueAfterTyping); }
+	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>雲雀</color>", NULL, "<color=#f5e6d3>Skylark</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 0, "ps3/s12/00/hiba28008", 256, TRUE);
 	OutputLine(NULL, "「命を狙われているとの匿名電話があったと言っています。",
 		   NULL, "\"She told them that she got an anonymous call.", Line_WaitForInput);
@@ -2611,7 +2611,7 @@ void main()
 		   NULL, " Doesn't she trust the Mountain Dogs...?\"", Line_Normal);
 	ClearMessage();
 
-	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>雲雀</color>", NULL, "<color=#f5e6d3>Hibari</color>", NULL, Line_ContinueAfterTyping); }
+	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>雲雀</color>", NULL, "<color=#f5e6d3>Skylark</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 0, "ps3/s12/00/hiba28011", 256, TRUE);
 	OutputLine(NULL, "「厄介ですね。",
 		   NULL, "\"This is trouble.", Line_WaitForInput);
@@ -2635,7 +2635,7 @@ void main()
 		   NULL, " We don't want them to become suspicious of us.\"", Line_Normal);
 	ClearMessage();
 
-	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>雲雀</color>", NULL, "<color=#f5e6d3>Hibari</color>", NULL, Line_ContinueAfterTyping); }
+	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>雲雀</color>", NULL, "<color=#f5e6d3>Skylark</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 0, "ps3/s12/00/hiba28013", 256, TRUE);
 	OutputLine(NULL, "「了解。",
 		   NULL, "\"Roger.", Line_WaitForInput);
@@ -2648,7 +2648,7 @@ void main()
 	ModPlayVoiceLS(4, 0, "ps3/s12/00/hiba28016", 256, TRUE);
 	OutputLine(NULL, "職質には特に注意されたし。」",
 		   NULL, " Please be mindful of them. ", GetGlobalFlag(GLinemodeSp));
-	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>雲雀</color>", NULL, "<color=#f5e6d3>Hibari</color>", NULL, Line_ContinueAfterTyping); }
+	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>雲雀</color>", NULL, "<color=#f5e6d3>Skylark</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(4, 0, "ps3/s12/00/hiba28017", 256, TRUE);
 	OutputLine(NULL, "今夜の決行ですが、様子を見た方がよろしいのでは。」",
 		   NULL, "We may have to postpone tonight's mission...\"", Line_Normal);

diff --git a/Update/_mina_026.txt b/Update/_mina_026.txt
@@ -246,7 +246,7 @@ void main()
 
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　……何と説明すればいいのか、私はどこまでを話しても大丈夫なのか、",
-		   NULL, "...I don't know how to explain it her, or how much I should tell her.", Line_WaitForInput);
+		   NULL, "...I don't know how to explain it to her, or how much I should tell her.", Line_WaitForInput);
 	OutputLine(NULL, "頭を悩めようとした時、階段を上がってくる賑やかな足音や声に驚いた。",
 		   NULL, " However, my thoughts were soon interrupted by the noise of a crowd.", GetGlobalFlag(GLinemodeSp));
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }