higurashi-cs/onikakushi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Not even sure why git put these lines in.

Browse Source
This commit is contained in:
Norgus
2018-05-08 21:56:25 +01:00
parent 0936c74609
commit 3814302392
2 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Update/zonik_005_vm00_n01.txt
View File

@@ -51,7 +51,6 @@ void dialog003()
NULL, "\"Ahahaha~ Keiichi-kun is bending forward... kyute kyute!!\"", GetGlobalFlag(GLinemodeSp)); NULL, "\"Ahahaha~ Keiichi-kun is bending forward... kyute kyute!!\"", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
} }
<<<<<<< HEAD
void dialog004() void dialog004()
{ {
@@ -125,5 +124,3 @@ void dialog006()
NULL, "I heard what sounded like a \"zhazhing\" three times. His 3-gauge super!?", Line_Normal); NULL, "I heard what sounded like a \"zhazhing\" three times. His 3-gauge super!?", Line_Normal);
ClearMessage(); ClearMessage();
} }
=======
>>>>>>> 3895b805810bfc1a554b8e247727a020a188e2f5

3
Update/zonik_005_vm0x_n01.txt
View File

@@ -51,7 +51,6 @@ void dialog003()
NULL, "\"Ahahaha~ Keiichi-kun is so... kyute kyute!!\"", GetGlobalFlag(GLinemodeSp)); NULL, "\"Ahahaha~ Keiichi-kun is so... kyute kyute!!\"", GetGlobalFlag(GLinemodeSp));
if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); } if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
} }
<<<<<<< HEAD
void dialog004() void dialog004()
{ {
@@ -125,5 +124,3 @@ void dialog006()
NULL, "A \"zhazhing\" sound echoed loudly. He went straight for the special move!?", Line_Normal); NULL, "A \"zhazhing\" sound echoed loudly. He went straight for the special move!?", Line_Normal);
ClearMessage(); ClearMessage();
} }
=======
>>>>>>> 3895b805810bfc1a554b8e247727a020a188e2f5