v1.12 import

c0data_toc.csv

@@ -2,7 +2,7 @@
 # font replacement
 0,temp\FONT_A.dds,FONT_A.dds
 # manual.mpk
-1,cc-edited-images\manual\help00.dds,help00.dds
+1,cc-edited-images\manual\help00_steam.dds,help00_steam.dds
 2,cc-edited-images\manual\help01.dds,help01.dds
 # translated system textures
 3,cc-edited-images\system\backlog.dds,backlog.dds

content/CCPatch-README.txt

@@ -1,6 +1,6 @@
 CHAOS;CHILD Steam Patch
 Committee of Zero
-Version 1.11 - February 3, 2019
+Version 1.12 - May 21, 2019
 ==============================
 http://sonome.dareno.me
 https://twitter.com/CommitteeOf0
@@ -12,6 +12,19 @@ See http://sonome.dareno.me/projects/chaoschild-steam.html for details, contact
 
 For troubleshooting, please come to our Discord. You can always find the latest version of the patch at https://github.com/CommitteeOfZero/cc-patch/releases
 
+==============================
+Changes from 1.11:
+==============================
+
+* Fixed compatibility with May 20, 2019 Steam update.
+* Adjusted edited keyboard help for Steam version.
+* Fixed launcher issue with moving save files from a system with a controller installed to a system without one ("There is an error importing setup files").
+* Controller input can now be disabled to work around phantom inputs.
+* Replaced update checker technology as the old one was causing launcher crashes for a small number of users.
+* Fixed launcher not starting with "Entry Point Not Found" error for a small number of users.
+* Fixed replaced videos failing to play for some Linux users.
+* More typo fixes etc.
+
 ==============================
 Changes from 1.1:
 ==============================

content/languagebarrier/THIRDPARTY.patch.txt

@@ -14,9 +14,11 @@ LanguageBarrier:
 
 Launcher/Installer:
 * Qt 5.9 <https://qt.io>
-* OpenSSL <https://www.openssl.org/> - builds provided by https://indy.fulgan.com/SSL/
 * Xdelta3 <http://xdelta.org/>
 * 7-zip SFX module <https://7-zip.org/>
+* cURL <https://curl.haxx.se/>
+* dr_mp3 <https://github.com/mackron/dr_libs>
+* miniaudio <https://github.com/dr-soft/miniaudio>
 
 Subtitle fonts:
 * Soukou Mincho <https://www.fontsquirrel.com/fonts/soukou-mincho>
@@ -712,134 +714,30 @@ Library.
 
 -------------------------------
 
-OpenSSL 1.0.2o
-
-
-  LICENSE ISSUES
-  ==============
-
-  The OpenSSL toolkit stays under a dual license, i.e. both the conditions of
-  the OpenSSL License and the original SSLeay license apply to the toolkit.
-  See below for the actual license texts. Actually both licenses are BSD-style
-  Open Source licenses. In case of any license issues related to OpenSSL
-  please contact openssl-core@openssl.org.
-
-  OpenSSL License
-  ---------------
-
-/* ====================================================================
- * Copyright (c) 1998-2016 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
- Original SSLeay License
- -----------------------
-
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
- *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
- */
+libcurl 7.64.0
+
+COPYRIGHT AND PERMISSION NOTICE
+
+Copyright (c) 1996 - 2019, Daniel Stenberg, <daniel@haxx.se>, and many
+contributors, see the THANKS file.
+
+All rights reserved.
+
+Permission to use, copy, modify, and distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright
+notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN
+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of a copyright holder shall not
+be used in advertising or otherwise to promote the sale, use or other dealings
+in this Software without prior written authorization of the copyright holder.
 
 -------------------------------
 
@@ -861,6 +759,38 @@ limitations under the License.
 
 -------------------------------
 
+dr_mp3
+Copyright 2018 David Reid
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+-------------------------------
+
+miniaudio
+Copyright 2019 David Reid
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so.
+
+-------------------------------
+
 SfxSetup.c - 7z SFX Setup
 2017-04-04 : Igor Pavlov : Public domain
 

content/languagebarrier/defaultconfig.json

@@ -1,7 +1,10 @@
 {
-  "__schema_version": 3,
+  "__schema_version": 4,
+  "showAllSettings": false,
+  "controllerEnabled": true,
   "improveDialogueOutlines": true,
   "hqFmvAudio": true,
   "consistency": true,
-  "karaokeSubs": "all"
+  "karaokeSubs": "all",
+  "selectedController": ""
 }

content/languagebarrier/gamedef.json

@@ -396,7 +396,7 @@
       "useOfVoiceTable": {
         "occurrence": 0,
         "offset": 2,
-        "pattern": "8B ?? ?? ?? ?? ?? 0F B7 07 0F B6 F0 C1 E8 08",
+        "pattern": "8B ?? ?? ?? ?? ?? 53 56 8B D8 0F B7 74 8A 04",
         "expr": "*ptr"
       },
       "SCRcomKeyWaitTimer": {
@@ -409,6 +409,17 @@
         "offset": 2,
         "pattern": "83 3D ?? ?? ?? ?? ?? 74 90 5E 8B E5 5D C3",
         "expr": "*ptr"
+      },
+      "PadUpdateDevice": {
+        "occurrence": 0,
+        "offset": 0,
+        "pattern": "80 3D ?? ?? ?? ?? ?? 75 03 33 C0 C3"
+      },
+      "useOfControllerGuid": {
+        "occurrence": 0,
+        "offset": 3,
+        "pattern": "6A 28 68 ?? ?? ?? ?? ?? E8",
+        "expr": "*ptr"
       }
     }
   }

content/languagebarrier/patchdef.json

@@ -1,8 +1,8 @@
 {
   "__schema_version": 2,
   "appdatadir": "Committee of Zero\\CCSteam",
-  "patchName": "[CoZ] CHAOS;CHILD Steam Patch (1.11)",
-  "patchVersion": "1.11",
+  "patchName": "[CoZ] CHAOS;CHILD Steam Patch (1.12)",
+  "patchVersion": "1.12",
   "base": {
     "hookText": true,
     "improveDialogueOutlines": false,
@@ -39,7 +39,9 @@
       },
       "videoRedirection": {
         "diseff_001a.bk2": "DISEFF_001A.bik",
+        "diseff_001a_en.bk2": "DISEFF_001A.bik",
         "cc_mov005a.bk2": "cc_mov005a.bik",
+        "cc_mov005a_en.bk2": "cc_mov005a.bik",
         "cc_ttl001a.bk2": "cc_ttl001a.bik",
         "cc_ttl002a.bk2": "cc_ttl002a.bik",
         "cc_ttl003a.bk2": "cc_ttl003a.bik",
@@ -480,7 +482,8 @@
         },
         "fmv": {
           "videoRedirection": {
-            "cc_mov005a.bk2": "cc_mov005a-2.bik"
+            "cc_mov005a.bk2": "cc_mov005a-2.bik",
+            "cc_mov005a_en.bk2": "cc_mov005a-2.bik"
           }
         }
       }

content/languagebarrier/versioninfo.json

@@ -1,6 +1,6 @@
 {
   "__schema_version": 2,
   "channel": "stable-steam-win32",
-  "intVersion": 2,
+  "intVersion": 3,
   "updateCheckUrl": "https://raw.githubusercontent.com/CommitteeOfZero/cc-patch/master/update.json"
 }

doc/voicefix/README.md

@@ -24,7 +24,7 @@ became English `voice.mpk`:
 | **4**           | **Voice line 3, second half** |
 | **5**           | **Voice line 4**              |
 
-While the Steam version ships the modified audio data, they forgot to port over the modified lipsync data. Also, the Steam version's native code expects big-endian lipsync data (like some console builds and unlike the Japanese PC version).
+While the Steam version ships the modified audio data, they forgot to port over the modified lipsync data. Also, the original Steam version's native code expects big-endian lipsync data (like some console builds and unlike the Japanese PC version or later updates).
 
 ### Missing/mismatched audio
 

doc/voicefix/wavtable_endian_swap.py

@@ -7,4 +7,5 @@
 output = open("wavtable.dat", "wb")
 for i in range(0, count):
     num = struct.unpack(">H", input.read(2))[0]
-    output.write(struct.pack("<H", num))
+    output.write(struct.pack("<H", num))
+output.write(input.read())