Textová CG

and removing some unused files

.github/config.yml

@@ -1,17 +0,0 @@
-# Configuration for welcome - https://github.com/behaviorbot/welcome
-
-# Configuration for new-issue-welcome - https://github.com/behaviorbot/new-issue-welcome
-
-# Comment to be posted to on first time issues
-newIssueWelcomeComment: >
-  Hello, I'm a bot! I have a few things I want to share that can make your issue a lot simpler to understand. 😊
-
-  Important for DRM-free copies! If you game does not have voices, there's a big chance you are running an old version of the game, **and that means it is incompatible with our patch.** Check inside your ``StreamingAssets`` folder if you have a ``CompiledUpdateScripts`` folder. If it's not there... then go in the MangaGamer store and download the game again. Steam users don't have to worry about this!
-
-  1. Did you remember to properly describe what is happening (or what you found)? Giving some clues such as where it happens (like a line of dialog exactly like the one displayed in the game) helps a lot!
-
-  2. If you are having issues **installing** the patch, did you notice anything strange? Any errors in the command line window that appears while installing the patch?
-
-  3. Please post your computer specs! Knowing if you are running Windows, Mac or Linux helps a lot when answering to issues. If you don't know how to find your computer specs, running ``dxdiag`` might help on Windows. Press ``Windows+R`` and type ``dxdiag``. In the screen that will appear you can find a button that saves your computer info. Attach that here!
-
-  4. Every Higurashi chapter has a feature that saves a log containing all the tech stuff to fix issues. If your game crashes or looks broken, go into ``HigurashiEp0*_Data`` and upload the file ``output_log.txt`` for us. :)

.github/workflows/pr_compile_scripts.yml

@@ -1,97 +0,0 @@
-name: Generate Compiled Scripts Pull Request
-
-on:
-  - push
-  - pull_request
-
-jobs:
-  dll_build:
-    name: Build DLL
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v3
-        with:
-          repository: 07th-mod/higurashi-assembly
-          ref: oni-mod
-
-      # Note: This uses the mono bundled with Ubuntu to build the project
-      - name: Compile project
-        run: msbuild /p:Configuration=Release
-
-      - name: Save Git Hash
-        run: >-
-          git show --pretty="format:Commit: %H %d%nDate: %cs%n%n%B" --no-patch > ./bin/Release/Assembly-CSharp.version.txt
-
-      - name: Upload DLL as Artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: higurashi-dll
-          path: |
-            ./bin/Release/Assembly-CSharp.dll
-            ./bin/Release/Assembly-CSharp.version.txt
-          if-no-files-found: error
-
-  windows_build:
-    name: Windows Build
-    needs: dll_build
-    runs-on: windows-latest
-    permissions:
-      contents: write
-    strategy:
-      matrix:
-        python-version: [3.8]
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v3
-
-      # Download Windows artifacts
-      - name: Download DLL
-        uses: actions/download-artifact@v3
-        with:
-          name: higurashi-dll
-
-      # Setup python (Windows VM is Python 3.7 by default, we need at least Python 3.8)
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
-        with:
-          python-version: ${{ matrix.python-version }}
-
-      - name: Run Release Script
-        id: run_release
-        env:
-          HIGURASHI_BASE_EXTRACT_KEY: ${{ secrets.HIGURASHI_BASE_EXTRACT_KEY }}
-        run: |
-          curl -OJ https://raw.githubusercontent.com/07th-mod/higurashi_release/master/deploy_higurashi/deploy_higurashi.py
-          python deploy_higurashi.py ${{ github.event.repository.name }}
-          rm deploy_higurashi.py
-
-      # Publish a release
-      - name: Release
-        uses: softprops/action-gh-release@v1
-        if: startsWith(github.ref, 'refs/tags/') # only publish tagged commits
-        with:
-          files: |
-            output/*.zip
-          draft: true
-          name: ${{ steps.run_release.outputs.release_name }} # This output is set in the 'deploy_higurashi.py' script above
-          body: |
-            ## Install/Update Instructions
-
-            We **HIGHLY** recommend using [our installer](https://github.com/07th-mod/python-patcher/releases/latest) to install the mod automatically, instead of the files on this page.
-
-            ----
-
-            **DO NOT USE THE FILES BELOW UNLESS YOU REALLY WANT TO INSTALL MANUALLY, AND HAVE READ THE MANUAL INSTALL INSTRUCTIONS**
-
-            **THIS PAGE ONLY CONTAINS ONE PART OF THE PATCH. YOU NEED OTHER FILES FOR THE MOD TO WORK**
-
-            If you really want to install manually, follow the [manual install instructions](https://07th-mod.com/wiki/Higurashi/Manual-Installation/).
-
-            ----
-
-            # Changelog
-
-            - [PUT CHANGELOG ITEMS HERE]
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -72,3 +72,6 @@ $RECYCLE.BIN/
 *.lnk
 
 # End of https://www.gitignore.io/api/linux,macos,windows
+
+# WE CAN'T MAKE IT TOO EASY, THIS IS BASED ON 07TH-MOD AFTER ALL
+CompiledUpdateScripts

README.md

@@ -1,32 +1,5 @@
-# PS3 Voice and Graphics Patch
-#### For Higurashi No Naku Koro Ni - Chapter 1 Onikakushi
+# Český patch pro Onikakushi na bázi 07th-Mod
 
-> This repository **only** hosts the script files and a few voice files needed to fix bugs, check our [wiki](https://07th-mod.com/wiki/Higurashi/Higurashi-Getting-started) for instructions on how to install the patch!
+Tento repositář je fork toho od vývojářů 07th-Mod, který nahrazuje assety těmi, které jsou obsaženy v těch pro konzole. Tento fork je zaměřený na dodatečný překlad hry do češtiny. Tento repozitář konrétně obsahuje patch pro epizodu první, Onikakushi.
 
-This patch aims to combine the efforts of the ps3 voice patch and the ps3 sprites/background patch, and fill in missing voice files not covered by the original voice patch.
-
-# Installing the patch
-
-> [Check our wiki](https://07th-mod.com/wiki/).
-
-# Releases
-
-https://github.com/07th-mod/onikakushi/releases/
-
-This repository is in constant change. Sometimes new releases might get on hold until there is enough content to push a new patch. If the latest patch has a bug that seems to be already fixed in the repository, try downloading the master file. The master file will always have the latest files, regardless of the current release being outdated or not.
-
-# Developing with us
-
-Usually, older contributors are welcome to join the repository and push their own changes without supervision. However, you can also aid the development just by forking the repository and working on your own changes. After you are done, commit the changes, make a pull request and if it's good enough, the changes will be merged. Both approaches are more than welcome!
-
-# Credits
-
-- @enumag - For coding the new automation script
-- @Grelo - For updating the graphics patch entirely
-- Anon - For giving us the PS3 files and scripts
-- TheGuraGuraMan - For making the Sprite/BGM Patch
-- Another Anon - For providing the watermark-less window
-- @Norgus - For helping us reach v2 with thousands of fixes
-- @IrlPM - For helping with the 1440p Sprites and a lot of new features
-- @idealpersona and drojf  - For Making the Movie Support
-- @Inochi-PM - For making the whole new UI.
+Pro více informací a zasloužené titulky autorů, bez kterých by tento projekt nebyl uskutečnitelný, se prosím podívejte na [původní repozitář](https://github.com/07th-mod/onikakushi).

STYLE_MANUAL.md

@@ -0,0 +1,34 @@
+# Manuál stylu
+
+## Přepisy japonštiny
+
+- Obecně známé termíny: využít český přepis
+    - Období Šówa
+    - samuraj
+    - šintoismus
+    - jakuza
+    - Tokio, Kjóto, Ósaka
+    - _Obecně, pokud to má stránku na české Wikipedii a existuje v reálném životě, použijeme český přepis_
+- Termíny specifické pro Higurashi: využít Hepburn
+    - Keiichi Maebara
+    - Hinamizawa
+    - Tatarigoroshi-hen
+    - Oyashiro-sama
+    - _"Macuribajaši" působí nepřirozeně a **narušuje dohledatelnost** existujících materiálů_
+
+## Honorifika
+
+- -san, -sama, -chan, apod.
+- Je to velmi slozité rozhodnutí a trochu to bolí, ale vynecháme je
+- S českým skloňováním absolutně nejsou v souladu a překlad by nevyhnutelně zněl nepřirozeně, kdyby jsme se je pokusili zachovat
+- Pokud je to možné, pokusíme se najít tónální ekvivalentu, která zní dobře i v češtině
+    - -san ve formálním kontextu, -sama v kontextu zákazníka: pan, paní
+    - -sensei: pan doktor, učitel...
+    - apod.
+
+## Fonty
+
+- Uživatelské rozhraní: Hiragino Sans, v případě patkových písem Hiragino Mincho ProN, styly W3 a W6
+- Většina textových CG (tyuui, Bernkastel, apod.): Hiragino Mincho ProN, styl W3
+- Monology, poetické části, "titulek kapitoly" v den Watanagashi: Minion Pro, styl Medium Italic
+    - Zvýraznění subjektivních, lyrických nebo metaforických pasáží

Update/dummy.txt

@@ -0,0 +1,5 @@
+
+void main()
+{
+
+}

Update/flow.txt

@@ -29,7 +29,9 @@ void BrandLogo()
 	Wait( 2000 );
 	DrawSceneWithMask( "07th-mod", "logomask", 0, 0, 1000 );
 	Wait( 2000 );
-	DrawSceneWithMask( "black", "logomask", 0, 0, 1000 );
+	DrawSceneWithMask( "czchan", "logomask", 0, 0, 1000 );
+	Wait( 2000 );
+	DrawSceneWithMask( "white", "logomask", 0, 0, 1000 );
 
 	ModCallScriptSection("&opening", "OpeningLaunch");
 }

Update/onik_001.txt

@@ -3125,8 +3125,8 @@ void main()
 	ClearMessage();
 
 	DisableWindow();
+	if (GetGlobalFlag(GHideCG)) {DrawSceneWithMask("background/gk3", "m1", 0, 0, 1300 );}
 
-//	DrawSceneWithMask( "bg_108", "m1", 0, 0, 1300 );
 	DrawSceneWithMask("scene/008", "m1", 0, 0, 1300 );
 
 
@@ -3186,7 +3186,8 @@ void main()
 		   NULL, "As the fruit of my efforts(?), I can now reach over and take sides from anybody's lunch.", Line_Normal);
 	ClearMessage();
 
-//	DrawBustshot( 3, "sa_se_de_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 400, TRUE );	DrawBustshot( 3, "sa_se_de_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 400, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DisableWindow();}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(3, 4, "sprite/sa1a_def_a1_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 300, TRUE );}
 
 //「あらあら、圭一さんのお弁当は今日は大奮発ではございませんことぉ？＠
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
@@ -3245,9 +3246,9 @@ void main()
 
 
 
-//	DisableWindow();
-//	FadeBustshotWithFiltering( 3, "m1", 1, FALSE, 0, 0, 300, TRUE );
-//	DrawBustshot( 2, "ri_se_ni_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DisableWindow();}
+	if (GetGlobalFlag(GHideCG)) {FadeBustshotWithFiltering( 3, "m1", 1, FALSE, 0, 0, 200, TRUE );}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 5, "sprite/ri1_niko_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );}
 
 //「...昨夜のお夕食の煮物を少し取っておきましたですよ。￥
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
@@ -3305,9 +3306,9 @@ void main()
 		   NULL, "That's not easy to do.", Line_Normal);
 	ClearMessage();
 
-//	DisableWindow();
-//	DrawSceneWithMask( "bg_108", "left", 0, 0, 300 );
-//	DrawBustshot( 3, "me_se_de_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DisableWindow();}
+	if (GetGlobalFlag(GHideCG)) {DrawSceneWithMask("background/gk1", "left", 0, 0, 300 );}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(3, 3, "sprite/me1a_def_a1_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );}
 
 //「梨花ちゃんって何気にそーゆうの得意なんだよなぁ。＠
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }
@@ -3317,8 +3318,8 @@ void main()
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
-//	DisableWindow();
-//	DrawBustshotWithFiltering( 1, "re_se_wa_b1", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DisableWindow();}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacterWithFiltering(1, 2, "sprite/re1b_warai_b1_", "2", "left", 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); }
@@ -3334,9 +3335,9 @@ void main()
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
-//	DisableWindow();
-//	FadeBustshot( 3, FALSE, 0, 0, 0, 0, 200, TRUE );
-//	DrawBustshot( 3, "sa_se_aw_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 400, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DisableWindow();}
+	if (GetGlobalFlag(GHideCG)) {FadeBustshot( 3, FALSE, 0, 0, 0, 0, 200, TRUE );}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(3, 4, "sprite/sa1a_akuwarai_a1_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );}
 
 //「梨花はいろいろとすごいんですのよ＠をーっほっほっほ！＠
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
@@ -3358,9 +3359,9 @@ void main()
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
-//	DisableWindow();
-//	FadeBustshot( 1, FALSE, 0, 0, 0, 0, 1000, TRUE );
-//	DrawBustshot( 1, "ri_se_de_a1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 400, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DisableWindow();}
+	if (GetGlobalFlag(GHideCG)) {FadeBustshot( 1, FALSE, 0, 0, 0, 0, 400, TRUE );}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(1, 5, "sprite/ri1_def_a1_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 400, TRUE );}
 
 //「...ボクより、レナの方がお料理は上手です。＠
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#6972c1>梨花</color>", NULL, "<color=#6972c1>Rika</color>", NULL, Line_ContinueAfterTyping); }
@@ -3369,10 +3370,9 @@ void main()
 		   NULL, "\"...Rena's actually better at cooking than I am.\"", GetGlobalFlag(GLinemodeSp));
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n\n", Line_ContinueAfterTyping); }
 
-
-//	DisableWindow();
-//	DrawSceneWithMask( "bg_108", "m1", 0, 0, 300 );
-//	DrawBustshotWithFiltering( 2, "re_se_bi_a1", "m1", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DisableWindow();}
+	if (GetGlobalFlag(GHideCG)) {DrawSceneWithMask("background/gk1", "m1", 0, 0, 300 );}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacterWithFiltering(2, 2, "sprite/re1a_bikkuri_a1_", "2", "m1", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE );}
 
 
 //「......え、!w800あ、!w800...その......ね☆＠
@@ -3424,9 +3424,10 @@ void main()
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
 	OutputLine(NULL, "　みんなもレナの弁当箱には進んで箸を伸ばす。",
 		   NULL, "Everyone else pulled from Rena's lunch box constantly.", Line_Normal);
-//	ClearMessage();
-//	DisableWindow();
-//	DrawBustshot( 2, "re_se_ha_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
+	ClearMessage();
+
+	if (GetGlobalFlag(GHideCG)) {DisableWindow();}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 2, "sprite/re1a_hau_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );}
 
 //「これ、前に評判良かったからいっぱい作ってみたの＠...おいしいかな？!d800...かな？＠
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
@@ -3863,6 +3864,7 @@ void main()
 	PlaySE( 4, "wa_005", 56, 64 );
 	ShakeScreen( 1, 20, 20, 5, 0, );
 	DrawBustshot(5, "scene/001a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DrawBustshot(5, "background/furiker_a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );}
 
 
 	DrawScene("black", 100 );
@@ -3870,22 +3872,24 @@ void main()
 	PlaySE( 4, "wa_005", 56, 64 );
 	ShakeScreen( 1, 20, 20, 5, 0, );
 	DrawBustshot(5, "scene/001a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DrawBustshot(5, "background/furiker_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );}
 
 	PlaySE( 4, "wa_005", 56, 64 );
 	DrawBustshot(5, "scene/001a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DrawBustshot(5, "background/furiker_a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );}
 
 	PlaySE( 4, "wa_005", 56, 64 );
 	DrawBustshot(5, "scene/001b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DrawBustshot(5, "background/furiker_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );}
 
 	PlaySE( 4, "wa_005", 56, 64 );
 	DrawBustshot(5, "scene/001b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DrawBustshot(5, "background/furiker_a", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );}
 
 	PlaySE( 4, "wa_005", 56, 64 );
 	ShakeScreen( 1, 20, 20, 5, 0, );
 	DrawBustshot(5, "scene/001b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );
-
-
-//	DrawScene( "black", 100 );
+	if (GetGlobalFlag(GHideCG)) {DrawBustshot(5, "background/furiker_b", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 25, 50, TRUE );}
 
 
 //　すぱぱーん！＠

Update/onik_002.txt

@@ -1404,7 +1404,7 @@ void main()
 		   NULL, "It didn't change how much there was, but the implication behind it was different.", Line_Normal);
 	ClearMessage();
 	DisableWindow();
-//	DrawBustshot( 2, "sa_si_aw_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE );
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 4, "sprite/sa2a_akuwarai_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 400, TRUE );}
 	DrawScene("scene/101", 1000 );
 
 
@@ -1433,8 +1433,8 @@ void main()
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
 
-//	DisableWindow();
-//	DrawBustshot( 2, "sa_si_bi_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DisableWindow();}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 4, "sprite/sa2a_odoroki_a1_", "1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );}
 
 //「襟首を掴むのも反則でございますー！！！￥
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#fcdb77>沙都子</color>", NULL, "<color=#fcdb77>Satoko</color>", NULL, Line_ContinueAfterTyping); }
@@ -1444,7 +1444,6 @@ void main()
 	ClearMessage();
 
 	DisableWindow();
-//	FadeBustshot( 2, FALSE, 0, 0, 0, 0, 200, TRUE );
 	DrawScene("background/jt1", 1000 );
 
 //　激しい戦いは、豊富な運動量と肘によるブロックで序盤、沙都子が優位に立つかに見えたが、箸さばきの致命的な差が形勢を一気にひっくり返す＠

Update/onik_009_02.txt

@@ -714,8 +714,9 @@ void main()
 	DisableWindow();
 	DrawScene("black", 500 );
 	DrawSceneWithMask("scene/103a", "down", 0, 0, 1300 );
-
-//	DrawBustshotWithFiltering( 1, "night/ta_si_wa_a1", "left", 1, -160, 0, FALSE, 0, 0, 0, 0, 0, 0, 300, TRUE );
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(1, 9, "sprite/ta1_warai_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 0, FALSE );}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(3, 8, "sprite/tomi1_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 0, FALSE );}
+	if (GetGlobalFlag(GHideCG)) {DrawSceneWithMask("background/y_kawa3", "down", 0, 0, 1300 );}
 
 //「若い人たちはそうは思わなかったみたいだけれど…＠お年寄りたちはオヤシロさまの祟りだと疑わなかったみたいね。＠
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>女性</color>", NULL, "<color=#f5e6d3>Woman</color>", NULL, Line_ContinueAfterTyping); }
@@ -735,7 +736,8 @@ void main()
 		   NULL, "The woman with Tomitake-san chuckled mischievously.", GetGlobalFlag(GLinemodeSp));
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
-
+	if (GetGlobalFlag(GHideCG)) {DisableWindow();}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(3, 8, "sprite/tomi1_warai_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );}
 
 //　合わせて富竹さんも笑ったので、俺もつられて笑うことにする￥
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -743,8 +745,8 @@ void main()
 		   NULL, "Tomitake-san began laughing with her. It was so infectious I ended up laughing as well.", Line_Normal);
 	ClearMessage();
 
-//	DisableWindow();
-//	DrawBustshot( 1, "night/ta_si_de_a1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DisableWindow();}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(1, 9, "sprite/ta1_def_", "0", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );}
 
 //「…でも、…今ではどうかしらね＠結構いるんじゃないかしら＠若い人にも。＠
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>女性</color>", NULL, "<color=#f5e6d3>Woman</color>", NULL, Line_ContinueAfterTyping); }
@@ -768,10 +770,8 @@ void main()
 		   NULL, "\"A few... what?\"", GetGlobalFlag(GLinemodeSp));
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
-
-
-//	DisableWindow();
-//	DrawBustshot( 3, "night/tm_si_de_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DisableWindow();}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(3, 8, "sprite/tomi1_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );}
 
 //「信じてる人だよ＠…オヤシロさまの、祟り。＠
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
@@ -824,7 +824,7 @@ void main()
 
 	DisableWindow();
 	DrawSceneWithMask("scene/103b", "down", 0, 0, 1300 );
-//	DrawBustshot( 3, "night/tm_si_ko_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(3, 8, "sprite/tomi1_komaru_", "1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );}
 
 //「毎年…綿流しの日になるとね。!w1500/
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
@@ -960,8 +960,8 @@ void main()
 		   NULL, "With that in mind, could the housewife have been involved in some way, too?", Line_Normal);
 	ClearMessage();
 
-//	DisableWindow();
-//	DrawBustshot( 1, "night/ta_si_wa_a1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DisableWindow();}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(1, 9, "sprite/ta1_warai_", "1", -160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 0, 200, TRUE );}
 
 //「その通りよ。＠
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f5e6d3>女性</color>", NULL, "<color=#f5e6d3>Woman</color>", NULL, Line_ContinueAfterTyping); }
@@ -1000,9 +1000,8 @@ void main()
 		   NULL, " happened to be that of the younger brother of the dam supporter who fell to his death two years before.\"", GetGlobalFlag(GLinemodeSp));
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
-
-
-//	DrawBustshot( 3, "night/tm_si_de_a1", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DisableWindow();}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(3, 8, "sprite/tomi1_def_", "0", 160, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 20, 200, TRUE );}
 
 //「弟本人はまだ生きてるらしいね＠でもやはり……かなり気にしてね。近隣の町に引っ越してったらしいよ。￥
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#945c44>富竹</color>", NULL, "<color=#945c44>Tomitake</color>", NULL, Line_ContinueAfterTyping); }
@@ -1016,8 +1015,7 @@ void main()
 
 	DisableWindow();
 	FadeOutBGM( 2, 1000, TRUE );
-	DrawBustshotWithFiltering(5, "black", "down", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 25, 1300, TRUE );
-
+	DrawSceneWithMask("black", "down", 0, 0, 1300 );
 
 
 //　…しばらくの間、開いた口を閉じることができなかった￥

Update/onik_011.txt

@@ -2963,12 +2963,7 @@ void main()
 	PlaySE( 4, "wa_027", 56, 64 );
 	ModPlayVoiceLS(3, 2, "ps3/s01/02/120200139a", 256, TRUE);
 
-//  Replace CG with angry Rena sprite (originally re_se_hii_a1) if CGs are disabled (like the original Ryukishi game).
-//  For now, the LIES text and negative effect is still overlaid on the sprite to make this easier to implement.
-	if (GetGlobalFlag(GHideCG) == 1)
-	{
-		ModDrawCharacter(2, 2, "portrait/re1a_hig_okoru_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
-	}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 2, "portrait/re1a_hig_okoru_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 50, FALSE );}
 
 	DrawBG("scene/002b", 0, FALSE);
 	DrawBustshot(1, "text/oni_usoda", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 1, 0, FALSE );
@@ -3003,7 +2998,7 @@ void main()
 	ClearMessage();
 
 //  Reset Rena's sprite back to normal
-	if (GetGlobalFlag(GHideCG) == 1)
+	if (GetGlobalFlag(GHideCG))
 	{
 		DisableWindow();
 		ModDrawCharacter(2, 2, "portrait/re1a_hig_def_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );

Update/onik_012.txt

@@ -4109,8 +4109,9 @@ void main()
 	OutputLine(NULL, "　扉の隙間から片目だけを覗かせて、再び魅音の鷹の目が俺を貫いた。",
 		   NULL, "A single eye peered in through that narrow slit, and Mion's hawkish gaze peered at me once again.", Line_Normal);
 	ClearMessage();
-//	DisableWindow();
-//	DrawBustshotWithFiltering( 2, "me_si_him_a1", "left", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE );
+	DisableWindow();
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 3, "sprite/me2_hig_maji_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE );}
+	if (GetGlobalFlag(GHideCG)) {DrawScene("background/ma_g2", 200 );}
 	FadeFilm( 600 , TRUE );
 //「じゃあね圭ちゃん。＠
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#5ec69a>魅音</color>", NULL, "<color=#5ec69a>Mion</color>", NULL, Line_ContinueAfterTyping); }

Update/onik_013.txt

@@ -2668,7 +2668,7 @@ void main()
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
 	ModPlayVoiceLS(3, 2, "ps3/s01/02/120200191", 256, TRUE);
 	OutputLine(NULL, "「圭一くん、宿題忘れなんだって。",
-		   NULL, "\"Keiichi-kun said he forget his homework.", Line_WaitForInput);
+		   NULL, "\"Keiichi-kun said he forgot his homework.", Line_WaitForInput);
 	ModPlayVoiceLS(3, 2, "ps3/s01/02/120200192", 256, TRUE);
 	OutputLine(NULL, "あはははは。」",
 		   NULL, " Ahahahaha.\"", GetGlobalFlag(GLinemodeSp));

Update/onik_014_02.txt

@@ -4357,7 +4357,8 @@ void main()
 		   NULL, "\"...It's not a lie...\"", GetGlobalFlag(GLinemodeSp));
 	if (GetGlobalFlag(GADVMode)) { ClearMessage(); } else { OutputLineAll(NULL, "\n", Line_ContinueAfterTyping); }
 
-//	DrawBustshot( 2, "re_si_hii_b1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DisableWindow();}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 2, "sprite/re2b_hig_okoru_b1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );}
 
 //「嘘だよッ！！！！＠
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
@@ -4375,7 +4376,8 @@ void main()
 		   NULL, "Rena's outburst sent a jolt surging through my body...!!", Line_Normal);
 	ClearMessage();
 
-//	DrawBustshot( 2, "re_si_him_b1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DisableWindow();}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 2, "sprite/re2b_hig_muhyou_b1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );}
 
 //　チェーン越しに守られ、レナとの接点は扉の隙間のわずか１０数センチ＠
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -4681,6 +4683,7 @@ void main()
 	ClearMessage();
 
 	DisableWindow();
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 2, "sprite/re2b_hig_muhyou_b1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE );}
 	DrawScene("background/ma_g3_02", 200 );
 
 	PlayBGM( 2, "lsys15", 56, 0 );
@@ -4754,6 +4757,7 @@ void main()
 
 	DisableWindow();
 	DrawScene("scene/033a", 300 );
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 2, "sprite/re2a_hig_def_a1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );}
 
 //「......なんでかなぁ＠　不思議だね＠だね？＠
 	if (GetGlobalFlag(GADVMode)) { OutputLine("<color=#f0953d>レナ</color>", NULL, "<color=#f0953d>Rena</color>", NULL, Line_ContinueAfterTyping); }
@@ -4996,6 +5000,7 @@ void main()
 
 	DisableWindow();
 	DrawScene("black", 300 );
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 2, "sprite/re2b_hig_def_b1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );}
 	StopSE( 4 );
 
 //「...............だから圭一くん＠............ここを開けて＠　レナと一緒にご飯食べよ＠　きっとおいしいから、...............ね...？￥
@@ -6823,10 +6828,9 @@ void main()
 		   NULL, " In this shower which more resembled a waterfall... droplets of water dripped down from her hair...", Line_Normal);
 	ClearMessage();
 	DisableWindow();
-//	DrawFilm( 2,  34, 34, 255, 255, 0, 0, FALSE );
 	DrawSceneWithMask("scene/104", "right", 0, 0, 300 );
-//	DrawBustshotWithFiltering( 2, "re_si_him_a1", "left", 1, 0, 0, FALSE, 0, 0, 0, 0, 0, 10, 300, TRUE );
-//print 1
+	ModSetLayerFilter(2, 256, "night");
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 2, "sprite/re2b_hig_muhyou_b1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 300, TRUE );}
 
 //　それは両手をだらりとさせ、ただ、立ち尽くしているという表現が似合っていた＠
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }

Update/onik_015.txt

@@ -2542,7 +2542,6 @@ void main()
 		   NULL, "I could tell that the fear that I had beaten back once was now waiting for another opening to come at me...", Line_Normal);
 	ClearMessage();
 
-//	DrawBustshot( 2, "re_se_wa_a1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE );
 
 //　一体...誰だ...＠
 	if (GetGlobalFlag(GADVMode)) { OutputLineAll("", NULL, Line_ContinueAfterTyping); }
@@ -2558,7 +2557,8 @@ void main()
 		   NULL, "I peeked out from behind the tree at the person following me.", Line_Normal);
 	ClearMessage();
 	DisableWindow();
-//	FadeBustshotWithFiltering( 5, "left", 0, FALSE, 0, 0, 1300, TRUE );
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 2, "sprite/re1a_warai_a1_", "2", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 0, FALSE );}
+	if (GetGlobalFlag(GHideCG)) {DrawSceneWithMask("background/m_hi4", "left", 0, 0, 1300 );}
 
 
 	//set big CG
@@ -2586,8 +2586,8 @@ void main()
 	OutputLine(NULL, "　…レナの…様子が違ったからだ。",
 		   NULL, "This wasn't the same Rena that I knew...", Line_Normal);
 	ClearMessage();
-//	DisableWindow();
-//	DrawBustshot( 2, "re_se_hi_b1", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );
+	if (GetGlobalFlag(GHideCG)) {DisableWindow();}
+	if (GetGlobalFlag(GHideCG)) {ModDrawCharacter(2, 2, "sprite/re1b_def_b1_", "0", 0, 0, 0, FALSE, 0, 0, 0, 0, 0, 0, 0, 10, 200, TRUE );}
 
 
 

Update/zonik_001_vm00_n01.txt

@@ -1,16 +0,0 @@
-void main()
-{
-}
-
-void dialog000()
-{
-
-}
-
-void dialog001()
-{
-}
-
-void dialog002()
-{
-}

Update/zonik_001_vm0x_n01.txt

@@ -1,16 +0,0 @@
-void main()
-{
-}
-
-void dialog000()
-{
-
-}
-
-void dialog001()
-{
-}
-
-void dialog002()
-{
-}

Update/zonik_002_vm00_n01.txt

@@ -1,23 +0,0 @@
-void main()
-{
-}
-
-void dialog000()
-{
-}
-
-void dialog001()
-{
-}
-
-void dialog002()
-{
-}
-
-void dialog003()
-{
-}
-
-void dialog004()
-{
-}

Update/zonik_002_vm0x_n01.txt

@@ -1,23 +0,0 @@
-void main()
-{
-}
-
-void dialog000()
-{
-}
-
-void dialog001()
-{
-}
-
-void dialog002()
-{
-}
-
-void dialog003()
-{
-}
-
-void dialog004()
-{
-}

Update/zonik_009_02_vm00_n01.txt

@@ -1,7 +0,0 @@
-void main()
-{
-}
-
-void dialog000()
-{
-}

Update/zonik_009_02_vm0x_n01.txt

@@ -1,7 +0,0 @@
-void main()
-{
-}
-
-void dialog000()
-{
-}

Update/zonik_012_vm00_n01.txt

@@ -1,7 +0,0 @@
-void main()
-{
-}
-
-void dialog000()
-{
-}

Update/zonik_012_vm0x_n01.txt

@@ -1,7 +0,0 @@
-void main()
-{
-}
-
-void dialog000()
-{
-}

Update/zonik_tips_01_vm00_n01.txt

@@ -1,11 +0,0 @@
-void main()
-{
-}
-
-void dialog000()
-{
-}
-
-void dialog001()
-{
-}

Update/zonik_tips_01_vm0x_n01.txt

@@ -1,11 +0,0 @@
-void main()
-{
-}
-
-void dialog000()
-{
-}
-
-void dialog001()
-{
-}

Update/zonik_tips_02_vm00_n01.txt

@@ -1,7 +0,0 @@
-void main()
-{
-}
-
-void dialog000()
-{
-}

Update/zonik_tips_02_vm0x_n01.txt

@@ -1,7 +0,0 @@
-void main()
-{
-}
-
-void dialog000()
-{
-}

Update/zonik_tips_17_vm00_n01.txt

@@ -1,7 +0,0 @@
-void main()
-{
-}
-
-void dialog000()
-{
-}

Update/zonik_tips_17_vm0x_n01.txt

@@ -1,7 +0,0 @@
-void main()
-{
-}
-
-void dialog000()
-{
-}